diff --git a/MIGRATION-GUIDE.md b/MIGRATION-GUIDE.md index d196eaefe..fc800be94 100644 --- a/MIGRATION-GUIDE.md +++ b/MIGRATION-GUIDE.md @@ -6,17 +6,27 @@ This release removes legacy SDK support. This guide lists all removed classes and interfaces from SDK V1 and how to migrate to their SDK V2 equivalents. +### General design change +- Webhooks callbacks managements and parsing are now covered with 2 different services: + - "Event Destinations": for managing the configuration of event destinations in the Sinch platform. This includes creating, updating, listing, and deleting them. + - "Sinch Events": for parsing and handling incoming events from the Sinch platform. This includes parsing the incoming payloads into strongly-typed Java objects and providing utilities for handling these events in your application. + ### [`Conversation`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/package-summary.html) - Removed support of `SINCH_CHAT` channel. - [channelspecific.whatsapp.payment.OrderDetailsPayment](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/latest/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPayment.html) removed support of deprecated `payment_settings` in favor of new `payment_buttons` for payment methods. -- The `metadata` field has been **removed** from the [Conversation](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/latest/com/sinch/sdk/domains/conversation/models/v1/conversations/Conversation.html) and [CreateConversationRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/latest/com/sinch/sdk/domains/conversation/models/v1/conversations/request/CreateConversationRequest.html) classes. This field is no longer supported in the API and has been replaced with `metadataJson`. +- The `metadata` field has been **removed** from the [Conversation](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/latest/com/sinch/sdk/domains/conversation/models/v1/conversations/Conversation.html) and [CreateConversationRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/conversations/request/CreateConversationRequest.html) classes. This field is no longer supported in the API and has been replaced with `metadataJson`. - APIs returning a list are supporting common naming: `QueyParameters` models for filtering, sorting, and pagination onto requests and `ListResponse` models for responses. - New APIs supporting auto-pagination for list responses: - apps.list() - webhooks.list(). - templates.list(). - templates.listTranslations(). +- [CallbackSettings.secretForOverriddenCallbackUrls](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/conversation/models/v1/app/CallbackSettings.html#getSecretForOverriddenCallbackUrls()) is replaced by [EventDestinationSettings. +secretForOverriddenTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/EventDestinationSettings.html#getSecretForOverriddenTarget()). +- [SendEventRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequest.html#getCallbackUrl()) is replaced by [SendEventRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequest.html#getEventDestinationTarget()). +- [SendMessageRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequest.html#getCallbackUrl()) is replaced by [SendMessageRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequest.html#getEventDestinationTarget()). + - Templates: - Conversation `Template V1` is removed. Use Conversation`Template V2` instead. - Conversation Templates models moved from `com.sinch.sdk.domains.conversation.models.templates` package to `com.sinch.sdk.domains.conversation.templates.models`. @@ -33,10 +43,11 @@ This guide lists all removed classes and interfaces from SDK V1 and how to migra | `MessageContentType` | constant values prefixed with `CONTENT_` | | `OptInEventNotification` | constant values prefixed with `OPT_IN_` | | `OptOutEventNotification` | constant values prefixed with `OPT_OUT_` | -| `Templates V1` | Removed support for `Templates` V1 (see [MIGRATION-GUIDE](https://github.com/sinch/sinch-sdk-java/blob/main/MIGRATION-GUIDE.md#200)) | +| `Templates V1` | Removed support for `Templates` V1 | | Old class | New class | |-------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| api.v1.MessagesService.MessageSource | [messages.request.MessageSource](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/messages/request/MessageSource.html) | | messages.types.card.CardMessageMedia | [messages.types.media.MediaMessage](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/messages/types/media/MediaMessage.html) | | contact.request.IdentityConflictsListRequest | [contacts.request.ContactListIdentityConflictsQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/contacts/request/ContactListIdentityConflictsQueryParameters.html) | | contact.request.ContactListRequest | [contacts.request.ContactsListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/contacts/request/ContactsListQueryParameters.html) | @@ -46,41 +57,47 @@ This guide lists all removed classes and interfaces from SDK V1 and how to migra | conversation.response.ConversationsListRecentResponse | [conversations.response.RecentConversationsListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/conversations/response/RecentConversationsListResponse.html) | | events.request.EventsListRequest | [events.request.EventsListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/events/request/EventsListQueryParameters.html) | | messages.request.MessagesListRequest | [messages.request.MessagesListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/messages/request/MessagesListQueryParameters.html) | -| api.v1.MessagesService.MessageSource | [messages.request.MessageSource](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/messages/request/MessageSource.html) | +| webhooks.Webhook | [eventdestinations.EventDestination](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestination.html) | +| webhooks.events.ConversationWebhookEvent | [sinchevents.ConversationSinchEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/sinchevents/ConversationSinchEvent.html) | +| webhooks.WebhookTrigger | [sinchevents.EventDestinationTrigger](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/eventdestination/EventDestinationTrigger.html) | +| webhooks.WebhookTargetType | [sinchevents.EventDestinationTargetType](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/eventdestination/EventDestinationTargetType.html) | +| apps.CallbackSettings | [EventDestinationSettings](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettings.html) | #### Replacement Services -| Old package | New package | -|--------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| conversation.api.v1.AppService | [conversation.api.v1.AppsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/AppsService.html) | -| conversation.api.v1.ContactService | [conversation.api.v1.ContactsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/ContactsService.html) | -| conversation.api.v1.Conversation | [conversation.api.v1.ConversationsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/ConversationsService.html) | -| conversation.api.v1.EventService | [conversation.api.v1.EventsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/EventsService.html) | -| conversation.api.v1.WebHooksService | [conversation.api.v1.WebhooksService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/WebhookssService.html) | +| Old package | New package | +|------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| api.v1.AppService | [api.v1.AppsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/AppsService.html) | +| api.v1.ContactService | [api.v1.ContactsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/ContactsService.html) | +| api.v1.Conversation | [api.v1.ConversationsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/ConversationsService.html) | +| api.v1.EventService | [api.v1.EventsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/EventsService.html) | +| api.v1.WebHooksService | [api.v1.EventDestinationsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/EventDestinationsService.html) | +| | [api.v1.SinchEventsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/api/v1/SinchEventsService.html) | #### Replacement packages -| Old package | New package | -|--------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| conversation.models.v1.app | [conversation.models.v1.apps](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/apps/package-summary.html) | -| conversation.models.v1.contact | [conversation.models.v1.contacts](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/contacts/package-summary.html) | -| conversation.models.v1.conversation | [conversation.api.v1.conversations](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/conversations/package-summary.html) | -| conversation.models.v1.event | [conversation.api.v1.events](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/events/package-summary.html) | -| conversation.api.templates.v2.TemplatesServiceV2 | [conversation.templates.api.v2.TemplatesV2Service](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/templates/api/v2/TemplatesV2Service/package-summary.html) | +| Old package | New package | +|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| models.v1.app | [models.v1.apps](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/apps/package-summary.html) | +| models.v1.contact | [models.v1.contacts](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/contacts/package-summary.html) | +| models.v1.conversation | [models.v1.conversations](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/conversations/package-summary.html) | +| models.v1.event | [models.v1.events](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/events/package-summary.html) | +| models.v1.webhooks | [models.v1.evendestinations](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/package-summary.html) | +| models.v1.webhooks.events | [models.v1.sinchevents](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/sinchevents/package-summary.html) | +| api.templates.v2.TemplatesServiceV2 | [conversation.templates.api.v2.TemplatesV2Service](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/templates/api/v2/TemplatesV2Service/package-summary.html) | #### Replacement APIs -| Old interface | New Equivalent | -|------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| ContactsService.getChannelProfileByChannelIdentity() | Returned class is changed from `String` to [GetChannelProfileResponse](openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/contacts/response/GetChannelProfileResponse.java) | -| ContactsService.getChannelProfileByContactId() | Returned class is changed from `String` to [GetChannelProfileResponse](openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/contacts/response/GetChannelProfileResponse.java) | -| AppsService.list(...) | Returned class is changed from `Collection` to `AppsListResponse` | -| MessagesService.get(...) | Is accepting now a `MessagesGetQueryParameeters` object for request parameters instead of individual parameters. | -| MessagesService.delete(...) | Is accepting now a `MessagesDeleteQueryParameeters` object for request parameters instead of individual parameters. | -| MessagesService.update(...) | Is accepting now a `MessagesUpdateQueryParameeters` object for request parameters instead of individual parameters. | -| WebhooksService.create(...) | Request parameter type is changed from `Webhook` to [CreateWebhookRequest](openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequest.java) | -| WebhooksService.list(...) | Returned class is changed from `Collection` to `WebhooksListResponse` | -| TemplatesServiceV2.list(...) | Returned class is changed from `Collection` to `TemplatesV2ListResponse` | -| TemplatesServiceV2.listTranslations(...) | Returned class is changed from `Collection` to `TranslationV2ListResponse` | - +| Old interface | New Equivalent | +|------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ContactsService.getChannelProfileByChannelIdentity() | Returned class is changed from `String` to [GetChannelProfileResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/contacts/response/GetChannelProfileResponse.html) | +| ContactsService.getChannelProfileByContactId() | Returned class is changed from `String` to [GetChannelProfileResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/contacts/response/GetChannelProfileResponse.html) | +| AppsService.list(...) | Returned class is changed from `Collection` to [AppsListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppsListResponse.html) | +| MessagesService.get(...) | Is accepting now a `MessagesGetQueryParameeters` object for request parameters instead of individual parameters. | +| MessagesService.delete(...) | Is accepting now a `MessagesDeleteQueryParameeters` object for request parameters instead of individual parameters. | +| MessagesService.update(...) | Is accepting now a `MessagesUpdateQueryParameeters` object for request parameters instead of individual parameters. | +| WebhooksService.create(...) | Request parameter type is changed from `Webhook` to [EventDestinationCreateRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/eventdestinations/request/EventDestinationCreateRequest.html) | +| WebhooksService.list(...) | Returned class is changed from `Collection` to [EventDestinationsListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponse.html) | +| TemplatesServiceV2.list(...) | Returned class is changed from `Collection` to [TemplatesV2ListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponse.html) | +| TemplatesServiceV2.listTranslations(...) | Returned class is changed from `Collection` to [TranslationV2ListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponse.html) | ### [`Numbers`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/package-summary.html) #### Replacement models diff --git a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java index 9ca21c74a..dd36aec6c 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java @@ -76,12 +76,20 @@ public interface ConversationService { ProjectSettingsService projectSettings(); /** - * SinchEventsService Service instance + * Event Destinations Management Service instance * * @return service instance for project - * @since 1.3 + * @since 2.0 + */ + EventDestinationsService eventDestinations(); + + /** + * Sinch Events helpers instance + * + * @return service instance for project + * @since 2.0 */ - WebhooksService webhooks(); + SinchEventsService sinchEvents(); /** * Templates Service instance diff --git a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/SinchEventsService.java b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/SinchEventsService.java new file mode 100644 index 000000000..91acf52b1 --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/SinchEventsService.java @@ -0,0 +1,54 @@ +package com.sinch.sdk.domains.conversation.api.v1; + +import com.sinch.sdk.core.exceptions.ApiMappingException; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent; +import java.util.Map; + +/** + * Sinch Events service + * + *

Callback events are used to get notified about Conversation usage according to your configured + * callback URL + * + *

see online + * documentation + * + * @since 2.0 + */ +public interface SinchEventsService { + + /** + * The Sinch Platform can initiate callback requests to a URL you define (Callback URL) on request + * and result events. All callback requests are signed and the signature is included in the + * Authorization header of the request + * + *

By using following function, you can ensure authentication according to received payload + * from your backend + * + * @param secret Secret token to be used to validate received request. See App's webhook configuration onto dashboard + * @param headers Received headers + * @param jsonPayload Received payload + * @return Is authentication validated (true) or not (false) + *

see online + * documentation + * @since 2.0 + */ + boolean validateAuthenticationHeader( + String secret, Map headers, String jsonPayload); + + /** + * This function can be called to deserialize received payload onto callback onto proper java + * verification event class + * + * @param jsonPayload Received payload to be deserialized + * @return The verification event instance class + *

see triggered + * events + * @since 2.0 + */ + ConversationSinchEvent parseEvent(String jsonPayload) throws ApiMappingException; +} diff --git a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationService.java b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationService.java index 2360014a0..391ec722e 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationService.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationService.java @@ -11,11 +11,11 @@ import com.sinch.sdk.domains.conversation.api.v1.CapabilityService; import com.sinch.sdk.domains.conversation.api.v1.ContactsService; import com.sinch.sdk.domains.conversation.api.v1.ConversationsService; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; import com.sinch.sdk.domains.conversation.api.v1.EventsService; import com.sinch.sdk.domains.conversation.api.v1.MessagesService; import com.sinch.sdk.domains.conversation.api.v1.ProjectSettingsService; import com.sinch.sdk.domains.conversation.api.v1.TranscodingService; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; import com.sinch.sdk.domains.conversation.api.v1.adapters.credentials.LineEnterpriseCredentialsMapper; import com.sinch.sdk.domains.conversation.api.v1.adapters.events.app.AppEventMapper; import com.sinch.sdk.domains.conversation.api.v1.adapters.events.contactmessage.internal.ContactMessageEventMapper; @@ -45,7 +45,6 @@ import com.sinch.sdk.models.ConversationContext; import com.sinch.sdk.models.UnifiedCredentials; import java.util.AbstractMap; -import java.util.Collections; import java.util.Map; import java.util.Objects; import java.util.function.Supplier; @@ -74,7 +73,8 @@ public class ConversationService private volatile TranscodingService transcoding; private volatile CapabilityService capability; private volatile ProjectSettingsService projectSettings; - private volatile WebhooksService webhooks; + private volatile EventDestinationsService eventDestinations; + private volatile SinchEventsService sinchEvents; private volatile TemplatesService templates; static { @@ -96,7 +96,7 @@ public ConversationService( public AppsService apps() { if (null == this.apps) { - instanceLazyInit(true); + instanceLazyInit(); this.apps = new AppsServiceImpl( httpClientSupplier.get(), @@ -110,7 +110,7 @@ public AppsService apps() { public ContactsService contacts() { if (null == this.contacts) { - instanceLazyInit(true); + instanceLazyInit(); this.contacts = new ContactsServiceImpl( httpClientSupplier.get(), @@ -124,7 +124,7 @@ public ContactsService contacts() { public MessagesService messages() { if (null == this.messages) { - instanceLazyInit(true); + instanceLazyInit(); this.messages = new MessagesServiceImpl( httpClientSupplier.get(), @@ -138,7 +138,7 @@ public MessagesService messages() { public ConversationsService conversations() { if (null == this.conversations) { - instanceLazyInit(true); + instanceLazyInit(); this.conversations = new ConversationsServiceImpl( httpClientSupplier.get(), @@ -152,7 +152,7 @@ public ConversationsService conversations() { public EventsService events() { if (null == this.events) { - instanceLazyInit(true); + instanceLazyInit(); this.events = new EventsServiceImpl( httpClientSupplier.get(), @@ -166,7 +166,7 @@ public EventsService events() { public TranscodingService transcoding() { if (null == this.transcoding) { - instanceLazyInit(true); + instanceLazyInit(); this.transcoding = new TranscodingServiceImpl( httpClientSupplier.get(), @@ -180,7 +180,7 @@ public TranscodingService transcoding() { public CapabilityService capability() { if (null == this.capability) { - instanceLazyInit(true); + instanceLazyInit(); this.capability = new CapabilityServiceImpl( httpClientSupplier.get(), @@ -199,24 +199,30 @@ public TemplatesService templates() { return this.templates; } - public WebhooksService webhooks() { - if (null == this.webhooks) { - instanceLazyInit(false); - this.webhooks = - new WebhooksServiceImpl( + public EventDestinationsService eventDestinations() { + if (null == this.eventDestinations) { + instanceLazyInit(); + this.eventDestinations = + new EventDestinationsServiceImpl( httpClientSupplier.get(), context.getServer(), authManagers, HttpMapper.getInstance(), - uriUUID, - new HmacAuthenticationValidation()); + uriUUID); } - return this.webhooks; + return this.eventDestinations; + } + + public SinchEventsService sinchEvents() { + if (null == this.sinchEvents) { + this.sinchEvents = new SinchEventsService(new HmacAuthenticationValidation()); + } + return this.sinchEvents; } public ProjectSettingsService projectSettings() { if (null == this.projectSettings) { - instanceLazyInit(true); + instanceLazyInit(); this.projectSettings = new ProjectSettingsServiceImpl( httpClientSupplier.get(), @@ -228,16 +234,12 @@ public ProjectSettingsService projectSettings() { return this.projectSettings; } - private void instanceLazyInit(boolean validateRequired) { + private void instanceLazyInit() { if (null != this.authManagers) { return; } synchronized (this) { if (null == this.authManagers) { - if (!validateRequired) { - this.authManagers = Collections.emptyMap(); - return; - } Objects.requireNonNull( credentials, "Conversation service requires credentials to be defined"); Objects.requireNonNull(context, "Conversation service requires context to be defined"); diff --git a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/SinchEventsService.java b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/SinchEventsService.java new file mode 100644 index 000000000..c7e5121d2 --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/SinchEventsService.java @@ -0,0 +1,37 @@ +package com.sinch.sdk.domains.conversation.api.v1.adapters; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.sinch.sdk.auth.HmacAuthenticationValidation; +import com.sinch.sdk.core.exceptions.ApiMappingException; +import com.sinch.sdk.core.utils.databind.Mapper; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; +import java.util.Map; + +public class SinchEventsService + implements com.sinch.sdk.domains.conversation.api.v1.SinchEventsService { + + private final HmacAuthenticationValidation authenticationChecker; + + public SinchEventsService(HmacAuthenticationValidation authenticationChecker) { + this.authenticationChecker = authenticationChecker; + } + + @Override + public boolean validateAuthenticationHeader( + String secret, Map headers, String jsonPayload) { + + return authenticationChecker.validateAuthenticationHeader(secret, headers, jsonPayload); + } + + @Override + public ConversationSinchEvent parseEvent(String jsonPayload) throws ApiMappingException { + try { + ConversationSinchEventInternalImpl dto = + Mapper.getInstance().readValue(jsonPayload, ConversationSinchEventInternalImpl.class); + return (ConversationSinchEvent) dto.getActualInstance(); + } catch (JsonProcessingException e) { + throw new ApiMappingException(jsonPayload, e); + } + } +} diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/package-info.java similarity index 53% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/package-info.java index d93d5e579..570dd2799 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/package-info.java @@ -1,8 +1,8 @@ /** - * Webhooks request models + * Conversation models for Event Destinations * * @see Webhooks * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.request; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/package-info.java similarity index 53% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/package-info.java index 4af029bb7..1ebd0676d 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/package-info.java @@ -1,8 +1,8 @@ /** - * Conversation models for Webhooks + * Event Destinations request models * * @see Webhooks * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/package-info.java similarity index 53% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/package-info.java index 07802ac40..275464d4f 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/package-info.java @@ -1,8 +1,8 @@ /** - * Webhooks response models + * Event Destinations response models * * @see Webhooks * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.response; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/package-info.java index 9fe9cd431..5177b4a0c 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/package-info.java @@ -3,8 +3,8 @@ * *

To start sending messages you must have a Conversation API app. * - *

The app holds information about the channel credentials and registered webhooks to which the - * API delivers callbacks such as message delivery receipts and contact messages. + *

The app holds information about the channel credentials and registered event destinations to + * which the API delivers callbacks such as message delivery receipts and contact messages. * *

If you don't already have an app please follow the instructions in the getting started guide * available in the Sinch Dashboard to create one.* diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/package-info.java index b73fc9779..9545d2fd9 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/package-info.java index 7bb21bdc0..adab33e3f 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/package-info.java index 087762c48..d8651847a 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/package-info.java index 1c56a70bc..b1b139b75 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/package-info.java index ed711b16a..675908cd4 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/package-info.java index d54fb6738..0c6326ef8 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/package-info.java index 845ea3c10..9dd21370a 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/package-info.java similarity index 56% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/package-info.java index e274fcd7e..3afa41e57 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/package-info.java new file mode 100644 index 000000000..592e22607 --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/package-info.java @@ -0,0 +1,7 @@ +/** + * Conversation models for Sinch Events sent onto callbacks + * + * @see callbacks + * @since 1.3 + */ +package com.sinch.sdk.domains.conversation.models.v1.sinchevents; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/package-info.java index 6ce385f05..4aa6672ba 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.record; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/package-info.java index fb4096b6c..f2c16f9a1 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/package-info.java similarity index 54% rename from client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/package-info.java rename to client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/package-info.java index 93d2d2dc8..3b9697f2e 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/package-info.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/package-info.java @@ -3,4 +3,4 @@ * * @since 1.3 */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported; diff --git a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/package-info.java b/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/package-info.java deleted file mode 100644 index 922556e37..000000000 --- a/client/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Conversation models for webhooks events sent onto callbacks - * - * @see callbacks - * @since 1.3 - */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events; diff --git a/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/WebHooksApiServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/EventDestinationsApiServiceTest.java similarity index 63% rename from client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/WebHooksApiServiceTest.java rename to client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/EventDestinationsApiServiceTest.java index cdf242d13..352447936 100644 --- a/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/WebHooksApiServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/EventDestinationsApiServiceTest.java @@ -19,11 +19,11 @@ 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.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.response.ListWebhookResponseDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.response.WebhooksListResponse; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationDtoTest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response.EventDestinationsListResponse; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response.EventDestinationsListResponseDtoTest; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -35,37 +35,35 @@ import org.mockito.Mock; @TestWithResources -public class WebHooksApiServiceTest extends ConversationBaseTest { +public class EventDestinationsApiServiceTest extends ConversationBaseTest { @Mock ServerConfiguration serverConfiguration; @Mock HttpClient httpClient; @Mock Map authManagers; - WebhooksService service; + EventDestinationsService service; String uriPartID = "foovalue"; - String fooWebhookId = "barWebhookId"; + String fooEventDestinationId = "barEventDestinationId"; String fooAppId = "barAppId"; static final Collection AUTH_NAMES = Arrays.asList("Basic", "oAuth2"); - @GivenTextResource("domains/conversation/v1/webhooks/WebhookRequestDto.json") - String jsonWebhookRequestDto; + @GivenTextResource( + "domains/conversation/v1/eventdestinations/request/EventDestinationRequestDto.json") + String eventDestinationRequestDto; - @GivenTextResource("/domains/conversation/v1/webhooks/WebhookResponseDto.json") - String jsonWebhookResponseDto; + @GivenTextResource( + "/domains/conversation/v1/eventdestinations/response/EventDestinationResponseDto.json") + String eventDestinationResponseDto; - @GivenTextResource("domains/conversation/v1/webhooks/response/ListWebhooksResponseDto.json") - String jsonListWebhooksResponseDto; + @GivenTextResource( + "domains/conversation/v1/eventdestinations/response/EventDestinationsListResponseDto.json") + String eventDestinationsListResponseDto; @BeforeEach public void initMocks() { service = - new WebhooksServiceImpl( - httpClient, - serverConfiguration, - authManagers, - HttpMapper.getInstance(), - uriPartID, - null); + new EventDestinationsServiceImpl( + httpClient, serverConfiguration, authManagers, HttpMapper.getInstance(), uriPartID); } @Test @@ -85,7 +83,8 @@ void list() throws ApiException { Collections.emptyList(), AUTH_NAMES); HttpResponse httpResponse = - new HttpResponse(200, null, Collections.emptyMap(), jsonListWebhooksResponseDto.getBytes()); + new HttpResponse( + 200, null, Collections.emptyMap(), eventDestinationsListResponseDto.getBytes()); when(httpClient.invokeAPI( eq(serverConfiguration), @@ -93,17 +92,19 @@ void list() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - WebhooksListResponse response = service.list(fooAppId); - Iterator iterator = response.iterator(); + EventDestinationsListResponse response = service.list(fooAppId); + Iterator iterator = response.iterator(); - WebhooksListResponse expectedListResponse = - new WebhooksListResponse( - new Page<>(ListWebhookResponseDtoTest.expectedResponseDto.getWebhooks(), null)); - Iterator expectedIterator = expectedListResponse.iterator(); + EventDestinationsListResponse expectedListResponse = + new EventDestinationsListResponse( + new Page<>( + EventDestinationsListResponseDtoTest.expectedResponseDto.getEventDestinations(), + null)); + Iterator expectedIterator = expectedListResponse.iterator(); while (iterator.hasNext()) { - Webhook item = iterator.next(); - Webhook expectedItem = expectedIterator.next(); + EventDestination item = iterator.next(); + EventDestination expectedItem = expectedIterator.next(); TestHelpers.recursiveEquals(item, expectedItem); } Assertions.assertThat(expectedIterator.hasNext()).isEqualTo(false); @@ -114,7 +115,7 @@ void get() throws ApiException { HttpRequest httpRequest = new HttpRequest( - String.format("/v1/projects/%s/webhooks/%s", uriPartID, fooWebhookId), + String.format("/v1/projects/%s/webhooks/%s", uriPartID, fooEventDestinationId), HttpMethod.GET, Collections.emptyList(), (String) null, @@ -123,7 +124,7 @@ void get() throws ApiException { Collections.emptyList(), AUTH_NAMES); HttpResponse httpResponse = - new HttpResponse(200, null, Collections.emptyMap(), jsonWebhookResponseDto.getBytes()); + new HttpResponse(200, null, Collections.emptyMap(), eventDestinationResponseDto.getBytes()); when(httpClient.invokeAPI( eq(serverConfiguration), @@ -131,9 +132,9 @@ void get() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - Webhook response = service.get(fooWebhookId); + EventDestination response = service.get(fooEventDestinationId); - TestHelpers.recursiveEquals(response, WebhookDtoTest.expectedResponseDto); + TestHelpers.recursiveEquals(response, EventDestinationDtoTest.expectedResponseDto); } @Test @@ -144,13 +145,13 @@ void create() throws ApiException { String.format("/v1/projects/%s/webhooks", uriPartID), HttpMethod.POST, Collections.emptyList(), - jsonWebhookRequestDto, + eventDestinationRequestDto, Collections.emptyMap(), Collections.singletonList(HttpContentType.APPLICATION_JSON), Collections.singletonList(HttpContentType.APPLICATION_JSON), AUTH_NAMES); HttpResponse httpResponse = - new HttpResponse(200, null, Collections.emptyMap(), jsonWebhookResponseDto.getBytes()); + new HttpResponse(200, null, Collections.emptyMap(), eventDestinationResponseDto.getBytes()); when(httpClient.invokeAPI( eq(serverConfiguration), @@ -158,9 +159,9 @@ void create() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - Webhook response = service.create(WebhookDtoTest.expectedRequestDto); + EventDestination response = service.create(EventDestinationDtoTest.expectedRequestDto); - TestHelpers.recursiveEquals(response, WebhookDtoTest.expectedResponseDto); + TestHelpers.recursiveEquals(response, EventDestinationDtoTest.expectedResponseDto); } @Test @@ -168,16 +169,16 @@ void update() throws ApiException { HttpRequest httpRequest = new HttpRequest( - String.format("/v1/projects/%s/webhooks/%s", uriPartID, fooWebhookId), + String.format("/v1/projects/%s/webhooks/%s", uriPartID, fooEventDestinationId), HttpMethod.PATCH, Collections.emptyList(), - jsonWebhookRequestDto, + eventDestinationRequestDto, Collections.emptyMap(), Collections.singletonList(HttpContentType.APPLICATION_JSON), Collections.singletonList(HttpContentType.APPLICATION_JSON), AUTH_NAMES); HttpResponse httpResponse = - new HttpResponse(200, null, Collections.emptyMap(), jsonWebhookResponseDto.getBytes()); + new HttpResponse(200, null, Collections.emptyMap(), eventDestinationResponseDto.getBytes()); when(httpClient.invokeAPI( eq(serverConfiguration), @@ -185,9 +186,10 @@ void update() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - Webhook response = service.update(fooWebhookId, WebhookDtoTest.expectedResponseDto); + EventDestination response = + service.update(fooEventDestinationId, EventDestinationDtoTest.expectedResponseDto); - TestHelpers.recursiveEquals(response, WebhookDtoTest.expectedResponseDto); + TestHelpers.recursiveEquals(response, EventDestinationDtoTest.expectedResponseDto); } @Test @@ -195,7 +197,7 @@ void delete() throws ApiException { HttpRequest httpRequest = new HttpRequest( - String.format("/v1/projects/%s/webhooks/%s", uriPartID, fooWebhookId), + String.format("/v1/projects/%s/webhooks/%s", uriPartID, fooEventDestinationId), HttpMethod.DELETE, Collections.emptyList(), (String) null, @@ -211,6 +213,6 @@ void delete() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - service.delete(fooWebhookId); + service.delete(fooEventDestinationId); } } diff --git a/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/WebhooksCallbackServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/SinchEventsServiceTest.java similarity index 61% rename from client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/WebhooksCallbackServiceTest.java rename to client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/SinchEventsServiceTest.java index 5224e5efa..a5061f9dd 100644 --- a/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/WebhooksCallbackServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/conversation/api/v1/adapters/SinchEventsServiceTest.java @@ -7,28 +7,28 @@ import com.sinch.sdk.SinchClient; import com.sinch.sdk.auth.HmacAuthenticationValidation; import com.sinch.sdk.core.exceptions.ApiException; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability.CapabilityEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.ChannelEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactCreateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactIdentitiesDuplicationEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactMergeEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactUpdateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStartEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStopEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.EventDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.MessageDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound.InboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageSubmitEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptInEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptOutEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record.RecordNotificationEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.MessageInboundSmartConversationRedactionEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.SmartConversationsEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported.UnsupportedCallbackEvent; +import com.sinch.sdk.domains.conversation.api.v1.SinchEventsService; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability.CapabilityEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.ChannelEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactCreateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactIdentitiesDuplicationEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactMergeEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactUpdateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStartEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStopEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.EventDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.MessageDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound.InboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageSubmitEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptInEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptOutEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.record.RecordNotificationEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.MessageInboundSmartConversationRedactionEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.SmartConversationsEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported.UnsupportedCallbackEvent; import java.util.AbstractMap; import java.util.Map; import java.util.stream.Collectors; @@ -37,88 +37,87 @@ import org.junit.jupiter.api.Test; @TestWithResources -public class WebhooksCallbackServiceTest extends ConversationBaseTest { +public class SinchEventsServiceTest extends ConversationBaseTest { - WebhooksService serverService; + SinchEventsService serverService; - @GivenTextResource("domains/conversation/v1/webhooks/events/capability/CapabilityEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/capability/CapabilityEventDto.json") String jsonCapabilityEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/channel/ChannelEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/channel/ChannelEventDto.json") String jsonChannelEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/contact/ContactCreateEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/contact/ContactCreateEventDto.json") String jsonContactCreateEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/contact/ContactDeleteEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/contact/ContactDeleteEventDto.json") String jsonContactDeleteEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDto.json") + "domains/conversation/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDto.json") String jsonContactIdentitiesDuplicationEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/contact/ContactMergeEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/contact/ContactMergeEventDto.json") String jsonContactMergeEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/contact/ContactUpdateEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/contact/ContactUpdateEventDto.json") String jsonContactUpdateEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/conversation/ConversationDeleteEventDto.json") + "domains/conversation/v1/sinchevents/conversation/ConversationDeleteEventDto.json") String jsonConversationDeleteEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/conversation/ConversationStartEventDto.json") + "domains/conversation/v1/sinchevents/conversation/ConversationStartEventDto.json") String jsonConversationStartEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/conversation/ConversationStopEventDto.json") + "domains/conversation/v1/sinchevents/conversation/ConversationStopEventDto.json") String jsonConversationStopEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/delivery/EventDeliveryReceiptEventDto.json") + "domains/conversation/v1/sinchevents/delivery/EventDeliveryReceiptEventDto.json") String jsonEventDeliveryReport; @GivenTextResource( - "domains/conversation/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDto.json") + "domains/conversation/v1/sinchevents/delivery/MessageDeliveryReceiptEventDto.json") String jsonMessageDeliveryReceiptEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/inbound/InboundContactEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/inbound/InboundContactEventDto.json") String jsonInboundEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/message/MessageInboundEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/message/MessageInboundEventDto.json") String jsonMessageInboundEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/message/MessageSubmitEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/message/MessageSubmitEventDto.json") String jsonMessageSubmitEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/opting/OptInEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/opting/OptInEventDto.json") String jsonOptInEvent; - @GivenTextResource("domains/conversation/v1/webhooks/events/opting/OptOutEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/opting/OptOutEventDto.json") String jsonOptOutEvent; - @GivenTextResource( - "domains/conversation/v1/webhooks/events/record/RecordNotificationEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/record/RecordNotificationEventDto.json") String jsonRecordNotificationEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDto.json") + "domains/conversation/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDto.json") String jsonMessageInboundSmartConversationRedactionEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/smartconversations/SmartConversationsEventDto.json") + "domains/conversation/v1/sinchevents/smartconversations/SmartConversationsEventDto.json") String jsonSmartConversationsEvent; @GivenTextResource( - "domains/conversation/v1/webhooks/events/unsupported/UnsupportedCallbackEventDto.json") + "domains/conversation/v1/sinchevents/unsupported/UnsupportedCallbackEventDto.json") String jsonUnsupportedCallbackEvent; @BeforeEach public void setUp() { // Get a service without any parameters to ensure webhooks callback // service can be used without them nor any performing any HTTP calls. - serverService = new SinchClient().conversation().v1().webhooks(); + serverService = new SinchClient().conversation().v1().sinchEvents(); } @Test diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/WebhooksSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/EventDestinationsSteps.java similarity index 65% rename from client/src/test/java/com/sinch/sdk/e2e/domains/conversation/WebhooksSteps.java rename to client/src/test/java/com/sinch/sdk/e2e/domains/conversation/EventDestinationsSteps.java index 9d5f4971c..fe5f4dd1d 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/WebhooksSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/EventDestinationsSteps.java @@ -1,13 +1,13 @@ package com.sinch.sdk.e2e.domains.conversation; import com.sinch.sdk.core.TestHelpers; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.ClientCredentials; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTargetType; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTrigger; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.request.CreateWebhookRequest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.response.WebhooksListResponse; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.ClientCredentials; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTargetType; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTrigger; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request.EventDestinationCreateRequest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response.EventDestinationsListResponse; import com.sinch.sdk.e2e.Config; import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; @@ -16,33 +16,33 @@ import java.util.Collections; import org.junit.jupiter.api.Assertions; -public class WebhooksSteps { +public class EventDestinationsSteps { static final String WEBHOOK_ID = "01W4FFL35P4NC4K35WEBHOOK004"; - WebhooksService service; - Webhook createResponse; + EventDestinationsService service; + EventDestination createResponse; - WebhooksListResponse listResponse; - Webhook getResponse; - Webhook updateResponse; + EventDestinationsListResponse listResponse; + EventDestination getResponse; + EventDestination updateResponse; boolean deletePassed; @Given("^the Conversation service \"Webhooks\" is available$") public void serviceAvailable() { - service = Config.getSinchClient().conversation().v1().webhooks(); + service = Config.getSinchClient().conversation().v1().eventDestinations(); } @When("^I send a request to create a conversation webhook$") public void create() { - CreateWebhookRequest request = - CreateWebhookRequest.builder() + EventDestinationCreateRequest request = + EventDestinationCreateRequest.builder() .setAppId(AppsSteps.APP_ID) .setTarget("https://my-callback-server.com/capability") - .setTriggers(Collections.singletonList(WebhookTrigger.CAPABILITY)) + .setTriggers(Collections.singletonList(EventDestinationTrigger.CAPABILITY)) .setSecret("CactusKnight_SurfsWaves") - .setTargetType(WebhookTargetType.HTTP) + .setTargetType(EventDestinationTargetType.HTTP) .build(); createResponse = service.create(request); @@ -63,13 +63,15 @@ public void get() { @When("^I send a request to update a conversation webhook$") public void update() { - Webhook request = - Webhook.builder() + EventDestination request = + EventDestination.builder() .setAppId("01W4FFL35P4NC4K35CONVAPP002") .setTarget("https://my-callback-server.com/capability-optin-optout") .setTriggers( Arrays.asList( - WebhookTrigger.CAPABILITY, WebhookTrigger.OPT_IN, WebhookTrigger.OPT_OUT)) + EventDestinationTrigger.CAPABILITY, + EventDestinationTrigger.OPT_IN, + EventDestinationTrigger.OPT_OUT)) .setSecret("SpacePanda_RidesUnicycle") .build(); updateResponse = service.update(WEBHOOK_ID, request); @@ -89,7 +91,8 @@ public void createResult() { createResponse.getTarget(), "https://my-callback-server.com/capability"); Assertions.assertEquals(createResponse.getSecret(), "CactusKnight_SurfsWaves"); Assertions.assertEquals(createResponse.getTriggers().size(), 1); - Assertions.assertEquals(createResponse.getTriggers().get(0), WebhookTrigger.CAPABILITY); + Assertions.assertEquals( + createResponse.getTriggers().get(0), EventDestinationTrigger.CAPABILITY); Assertions.assertNull(createResponse.getClientCredentials()); } @@ -98,7 +101,7 @@ public void listResult() { TestHelpers.checkIteratorItems(listResponse.iterator(), 4); - Webhook entry = + EventDestination entry = listResponse.stream() .filter(f -> f.getId().equals("01W4FFL35P4NC4K35WEBHOOK002")) .findFirst() @@ -106,24 +109,24 @@ public void listResult() { Assertions.assertEquals( entry.getTriggers(), Arrays.asList( - WebhookTrigger.CONTACT_CREATE, - WebhookTrigger.CONTACT_DELETE, - WebhookTrigger.CONTACT_IDENTITIES_DUPLICATION, - WebhookTrigger.CONTACT_MERGE, - WebhookTrigger.CONTACT_UPDATE)); + EventDestinationTrigger.CONTACT_CREATE, + EventDestinationTrigger.CONTACT_DELETE, + EventDestinationTrigger.CONTACT_IDENTITIES_DUPLICATION, + EventDestinationTrigger.CONTACT_MERGE, + EventDestinationTrigger.CONTACT_UPDATE)); Assertions.assertEquals(entry.getSecret(), "DiscoDragon_BuildsLego"); } @Then("the response contains the conversation webhook details") public void getResult() { - Webhook expected = - Webhook.builder() + EventDestination expected = + EventDestination.builder() .setId("01W4FFL35P4NC4K35WEBHOOK001") .setAppId(AppsSteps.APP_ID) .setTarget("https://my-callback-server.com/unsupported") - .setTargetType(WebhookTargetType.HTTP) + .setTargetType(EventDestinationTargetType.HTTP) .setSecret("VeganVampire_SipsTea") - .setTriggers(Collections.singletonList(WebhookTrigger.UNSUPPORTED)) + .setTriggers(Collections.singletonList(EventDestinationTrigger.UNSUPPORTED)) .setClientCredentials( ClientCredentials.builder() .setEndpoint("https://my-auth-server.com/oauth2/token") diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/WebhooksEventsSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/SinchEventsSteps.java similarity index 68% rename from client/src/test/java/com/sinch/sdk/e2e/domains/conversation/WebhooksEventsSteps.java rename to client/src/test/java/com/sinch/sdk/e2e/domains/conversation/SinchEventsSteps.java index 9f86759f4..1a9ff2b7e 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/WebhooksEventsSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/conversation/SinchEventsSteps.java @@ -1,35 +1,35 @@ package com.sinch.sdk.e2e.domains.conversation; import com.sinch.sdk.core.TestHelpers; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; +import com.sinch.sdk.domains.conversation.api.v1.SinchEventsService; import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentity; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.Reason; import com.sinch.sdk.domains.conversation.models.v1.ReasonCode; import com.sinch.sdk.domains.conversation.models.v1.ReasonSubCode; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTrigger; import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage; import com.sinch.sdk.domains.conversation.models.v1.messages.types.text.TextMessage; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTrigger; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability.CapabilityEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactCreateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactMergeEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactUpdateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStartEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStopEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.DeliveryStatus; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.EventDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.EventDeliveryReport; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.MessageDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.MessageDeliveryReport; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound.InboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageSubmitEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.MessageInboundSmartConversationRedactionEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.SmartConversationsEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability.CapabilityEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactCreateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactMergeEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactUpdateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStartEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStopEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.DeliveryStatus; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.EventDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.EventDeliveryReport; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.MessageDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.MessageDeliveryReport; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound.InboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageSubmitEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.MessageInboundSmartConversationRedactionEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.SmartConversationsEvent; import com.sinch.sdk.e2e.Config; import com.sinch.sdk.e2e.domains.WebhooksHelper; import io.cucumber.java.en.Given; @@ -45,127 +45,132 @@ import java.util.stream.Stream; import org.junit.jupiter.api.Assertions; -public class WebhooksEventsSteps { +public class SinchEventsSteps { static final String WEBHOOKS_PATH = Config.CONVERSATION_HOST_NAME + "/webhooks/conversation/"; static final String SECRET = "CactusKnight_SurfsWaves"; - Map> expectedClasses = + Map> expectedClasses = Stream.of( - new AbstractMap.SimpleEntry<>(WebhookTrigger.CAPABILITY, CapabilityEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_CREATE, ContactCreateEvent.class), + EventDestinationTrigger.CAPABILITY, CapabilityEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_DELETE, ContactDeleteEvent.class), - new AbstractMap.SimpleEntry<>(WebhookTrigger.CONTACT_MERGE, ContactMergeEvent.class), + EventDestinationTrigger.CONTACT_CREATE, ContactCreateEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_UPDATE, ContactUpdateEvent.class), + EventDestinationTrigger.CONTACT_DELETE, ContactDeleteEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONVERSATION_DELETE, ConversationDeleteEvent.class), + EventDestinationTrigger.CONTACT_MERGE, ContactMergeEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONVERSATION_START, ConversationStartEvent.class), + EventDestinationTrigger.CONTACT_UPDATE, ContactUpdateEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONVERSATION_STOP, ConversationStopEvent.class), + EventDestinationTrigger.CONVERSATION_DELETE, ConversationDeleteEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.EVENT_DELIVERY, EventDeliveryReceiptEvent.class), - new AbstractMap.SimpleEntry<>(WebhookTrigger.EVENT_INBOUND, InboundEvent.class), + EventDestinationTrigger.CONVERSATION_START, ConversationStartEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.MESSAGE_DELIVERY, MessageDeliveryReceiptEvent.class), + EventDestinationTrigger.CONVERSATION_STOP, ConversationStopEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.MESSAGE_INBOUND, MessageInboundEvent.class), + EventDestinationTrigger.EVENT_DELIVERY, EventDeliveryReceiptEvent.class), new AbstractMap.SimpleEntry<>( - WebhookTrigger.MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION, + EventDestinationTrigger.EVENT_INBOUND, InboundEvent.class), + new AbstractMap.SimpleEntry<>( + EventDestinationTrigger.MESSAGE_DELIVERY, MessageDeliveryReceiptEvent.class), + new AbstractMap.SimpleEntry<>( + EventDestinationTrigger.MESSAGE_INBOUND, MessageInboundEvent.class), + new AbstractMap.SimpleEntry<>( + EventDestinationTrigger.MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION, MessageInboundSmartConversationRedactionEvent.class)) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - Map triggerToURL = + Map triggerToURL = Stream.of( new AbstractMap.SimpleEntry<>( - WebhookTrigger.CAPABILITY, WEBHOOKS_PATH + "capability-lookup"), + EventDestinationTrigger.CAPABILITY, WEBHOOKS_PATH + "capability-lookup"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_CREATE, WEBHOOKS_PATH + "contact-create"), + EventDestinationTrigger.CONTACT_CREATE, WEBHOOKS_PATH + "contact-create"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_DELETE, WEBHOOKS_PATH + "contact-delete"), + EventDestinationTrigger.CONTACT_DELETE, WEBHOOKS_PATH + "contact-delete"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_MERGE, WEBHOOKS_PATH + "contact-merge"), + EventDestinationTrigger.CONTACT_MERGE, WEBHOOKS_PATH + "contact-merge"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONTACT_UPDATE, WEBHOOKS_PATH + "contact-update"), + EventDestinationTrigger.CONTACT_UPDATE, WEBHOOKS_PATH + "contact-update"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONVERSATION_DELETE, WEBHOOKS_PATH + "conversation-delete"), + EventDestinationTrigger.CONVERSATION_DELETE, + WEBHOOKS_PATH + "conversation-delete"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONVERSATION_START, WEBHOOKS_PATH + "conversation-start"), + EventDestinationTrigger.CONVERSATION_START, WEBHOOKS_PATH + "conversation-start"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.CONVERSATION_STOP, WEBHOOKS_PATH + "conversation-stop"), + EventDestinationTrigger.CONVERSATION_STOP, WEBHOOKS_PATH + "conversation-stop"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.EVENT_DELIVERY, WEBHOOKS_PATH + "event-delivery-report/succeeded"), + EventDestinationTrigger.EVENT_DELIVERY, + WEBHOOKS_PATH + "event-delivery-report/succeeded"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.EVENT_INBOUND, WEBHOOKS_PATH + "event-inbound"), + EventDestinationTrigger.EVENT_INBOUND, WEBHOOKS_PATH + "event-inbound"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.MESSAGE_DELIVERY, + EventDestinationTrigger.MESSAGE_DELIVERY, WEBHOOKS_PATH + "message-delivery-report/succeeded"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.MESSAGE_INBOUND, WEBHOOKS_PATH + "message-inbound"), + EventDestinationTrigger.MESSAGE_INBOUND, WEBHOOKS_PATH + "message-inbound"), new AbstractMap.SimpleEntry<>( - WebhookTrigger.MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION, + EventDestinationTrigger.MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION, WEBHOOKS_PATH + "message-inbound/smart-conversation-redaction")) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - WebhooksService service; + SinchEventsService service; - Map> receivedEvents = + Map> receivedEvents = new ConcurrentHashMap<>(); - WebhooksHelper.Response eventDeliveryReceiptFailedResponse; - WebhooksHelper.Response messageDeliveryReceiptFailedResponse; - WebhooksHelper.Response messageSubmitMediaResponse; - WebhooksHelper.Response messageSubmitTextResponse; - WebhooksHelper.Response smartConversationMediaResponse; - WebhooksHelper.Response smartConversationTextResponse; + WebhooksHelper.Response eventDeliveryReceiptFailedResponse; + WebhooksHelper.Response messageDeliveryReceiptFailedResponse; + WebhooksHelper.Response messageSubmitMediaResponse; + WebhooksHelper.Response messageSubmitTextResponse; + WebhooksHelper.Response smartConversationMediaResponse; + WebhooksHelper.Response smartConversationTextResponse; @Given("^the Conversation Webhooks handler is available$") public void handlerAvailable() { - service = Config.getSinchClient().conversation().v1().webhooks(); + service = Config.getSinchClient().conversation().v1().sinchEvents(); } @When("^I send a request to trigger a \"CAPABILITY\" event$") public void triggerCAPABILITY() throws IOException { - handleRequest(WebhookTrigger.CAPABILITY); + handleRequest(EventDestinationTrigger.CAPABILITY); } @When("^I send a request to trigger a \"CONTACT_CREATE\" event$") public void triggerCONTACT_CREATE() throws IOException { - handleRequest(WebhookTrigger.CONTACT_CREATE); + handleRequest(EventDestinationTrigger.CONTACT_CREATE); } @When("^I send a request to trigger a \"CONTACT_DELETE\" event$") public void triggerCONTACT_DELETE() throws IOException { - handleRequest(WebhookTrigger.CONTACT_DELETE); + handleRequest(EventDestinationTrigger.CONTACT_DELETE); } @When("^I send a request to trigger a \"CONTACT_MERGE\" event$") public void triggerCONTACT_MERGE() throws IOException { - handleRequest(WebhookTrigger.CONTACT_MERGE); + handleRequest(EventDestinationTrigger.CONTACT_MERGE); } @When("^I send a request to trigger a \"CONTACT_UPDATE\" event$") public void triggerCONTACT_UPDATE() throws IOException { - handleRequest(WebhookTrigger.CONTACT_UPDATE); + handleRequest(EventDestinationTrigger.CONTACT_UPDATE); } @When("^I send a request to trigger a \"CONVERSATION_DELETE\" event$") public void triggerCONVERSATION_DELETE() throws IOException { - handleRequest(WebhookTrigger.CONVERSATION_DELETE); + handleRequest(EventDestinationTrigger.CONVERSATION_DELETE); } @When("^I send a request to trigger a \"CONVERSATION_START\" event$") public void triggerCONVERSATION_START() throws IOException { - handleRequest(WebhookTrigger.CONVERSATION_START); + handleRequest(EventDestinationTrigger.CONVERSATION_START); } @When("^I send a request to trigger a \"CONVERSATION_STOP\" event$") public void triggerCONVERSATION_STOP() throws IOException { - handleRequest(WebhookTrigger.CONVERSATION_STOP); + handleRequest(EventDestinationTrigger.CONVERSATION_STOP); } @When("^I send a request to trigger a \"EVENT_DELIVERY\" event with a \"FAILED\" status$") @@ -177,12 +182,12 @@ public void triggerEVENT_DELIVERY_FAILED() throws IOException { @When("^I send a request to trigger a \"EVENT_DELIVERY\" event with a \"DELIVERED\" status$") public void triggerEVENT_DELIVERY() throws IOException { - handleRequest(WebhookTrigger.EVENT_DELIVERY); + handleRequest(EventDestinationTrigger.EVENT_DELIVERY); } @When("^I send a request to trigger a \"EVENT_INBOUND\" event$") public void triggerINBOUND() throws IOException { - handleRequest(WebhookTrigger.EVENT_INBOUND); + handleRequest(EventDestinationTrigger.EVENT_INBOUND); } @When("^I send a request to trigger a \"MESSAGE_DELIVERY\" event with a \"FAILED\" status$") @@ -196,17 +201,17 @@ public void triggerMESSAGE_DELIVERY_FAILED() throws IOException { "^I send a request to trigger a \"MESSAGE_DELIVERY\" event with a \"QUEUED_ON_CHANNEL\"" + " status$") public void triggerMESSAGE_DELIVERY() throws IOException { - handleRequest(WebhookTrigger.MESSAGE_DELIVERY); + handleRequest(EventDestinationTrigger.MESSAGE_DELIVERY); } @When("^I send a request to trigger a \"MESSAGE_INBOUND\" event$") public void triggerMESSAGE_INBOUND() throws IOException { - handleRequest(WebhookTrigger.MESSAGE_INBOUND); + handleRequest(EventDestinationTrigger.MESSAGE_INBOUND); } @When("^I send a request to trigger a \"MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION\" event$") public void triggerMESSAGE_INBOUND_SMART_CONVERSATION_REDACTION() throws IOException { - handleRequest(WebhookTrigger.MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION); + handleRequest(EventDestinationTrigger.MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION); } @When("^I send a request to trigger a \"MESSAGE_SUBMIT\" event for a \"media\" message$") @@ -239,8 +244,8 @@ public void triggerSMART_CONVERSATIONS_TEXT() throws IOException { @Then("the header of the Conversation event {string} contains a valid signature") public void validateHeader(String e2eKeyword) { - WebhooksHelper.Response receivedEvent = - receivedEvents.get(WebhookTrigger.from(e2eKeyword)); + WebhooksHelper.Response receivedEvent = + receivedEvents.get(EventDestinationTrigger.from(e2eKeyword)); if (null != receivedEvent) { boolean validated = @@ -252,8 +257,8 @@ public void validateHeader(String e2eKeyword) { @Then("the Conversation event describes a {string} event type") public void triggerResult(String e2eKeyword) { - WebhookTrigger trigger = WebhookTrigger.from(e2eKeyword); - WebhooksHelper.Response receivedEvent = receivedEvents.get(trigger); + EventDestinationTrigger trigger = EventDestinationTrigger.from(e2eKeyword); + WebhooksHelper.Response receivedEvent = receivedEvents.get(trigger); if (null != receivedEvent) { Assertions.assertInstanceOf(expectedClasses.get(trigger), receivedEvent.event); } @@ -264,19 +269,19 @@ public void triggerResult(String e2eKeyword) { + " signature") public void validateEventDeliveryFailureHeader(String e2eKeyword, String status) { - WebhooksHelper.Response receivedEvent = null; - if (e2eKeyword.equals(WebhookTrigger.EVENT_DELIVERY.value()) + WebhooksHelper.Response receivedEvent = null; + if (e2eKeyword.equals(EventDestinationTrigger.EVENT_DELIVERY.value()) && status.equals(DeliveryStatus.FAILED.value())) { receivedEvent = eventDeliveryReceiptFailedResponse; - } else if (e2eKeyword.equals(WebhookTrigger.EVENT_DELIVERY.value()) + } else if (e2eKeyword.equals(EventDestinationTrigger.EVENT_DELIVERY.value()) && status.equals(DeliveryStatus.DELIVERED.value())) { - receivedEvent = receivedEvents.get(WebhookTrigger.from(e2eKeyword)); - } else if (e2eKeyword.equals(WebhookTrigger.MESSAGE_DELIVERY.value()) + receivedEvent = receivedEvents.get(EventDestinationTrigger.from(e2eKeyword)); + } else if (e2eKeyword.equals(EventDestinationTrigger.MESSAGE_DELIVERY.value()) && status.equals(DeliveryStatus.FAILED.value())) { receivedEvent = messageDeliveryReceiptFailedResponse; - } else if (e2eKeyword.equals(WebhookTrigger.MESSAGE_DELIVERY.value()) + } else if (e2eKeyword.equals(EventDestinationTrigger.MESSAGE_DELIVERY.value()) && status.equals(DeliveryStatus.QUEUED_ON_CHANNEL.value())) { - receivedEvent = receivedEvents.get(WebhookTrigger.from(e2eKeyword)); + receivedEvent = receivedEvents.get(EventDestinationTrigger.from(e2eKeyword)); } else { Assertions.fail(); } @@ -367,7 +372,7 @@ public void messageDeliveryFailureResult() { "the header of the Conversation event {string} for a {string} message contains a valid" + " signature") public void validateMessageSubmitHeader(String e2eKeyword, String messageType) { - WebhooksHelper.Response receivedEvent = null; + WebhooksHelper.Response receivedEvent = null; if (e2eKeyword.equals("MESSAGE_SUBMIT") && messageType.equals("media")) { receivedEvent = messageSubmitMediaResponse; } else if (e2eKeyword.equals("MESSAGE_SUBMIT") && messageType.equals("text")) { @@ -446,9 +451,9 @@ public void messageTypeEventResult(String e2eKeyword, String messageType) { } } - public void handleRequest(WebhookTrigger trigger) throws IOException { + public void handleRequest(EventDestinationTrigger trigger) throws IOException { - WebhooksHelper.Response response = + WebhooksHelper.Response response = WebhooksHelper.callURL(new URL(triggerToURL.get(trigger)), service::parseEvent); receivedEvents.put(trigger, response); } diff --git a/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/Controller.java b/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/Controller.java index 47a0ea608..0f6e90254 100644 --- a/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/Controller.java +++ b/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/Controller.java @@ -1,9 +1,9 @@ package com.mycompany.app.conversation; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEvent; +import com.sinch.sdk.domains.conversation.api.v1.SinchEventsService; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEvent; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -17,12 +17,12 @@ public class Controller { private final SinchClient sinchClient; - private final ServerBusinessLogic webhooksBusinessLogic; + private final ServerBusinessLogic serverBusinessLogic; @Autowired - public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessLogic) { + public Controller(SinchClient sinchClient, ServerBusinessLogic serverBusinessLogic) { this.sinchClient = sinchClient; - this.webhooksBusinessLogic = webhooksBusinessLogic; + this.serverBusinessLogic = serverBusinessLogic; } @PostMapping( @@ -32,14 +32,14 @@ public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessL public ResponseEntity conversationEvent( @RequestHeader Map headers, @RequestBody String body) { - WebhooksService webhooks = sinchClient.conversation().v1().webhooks(); + SinchEventsService sinchEvents = sinchClient.conversation().v1().sinchEvents(); // decode the request payload - ConversationWebhookEvent event = webhooks.parseEvent(body); + ConversationSinchEvent event = sinchEvents.parseEvent(body); // let business layer process the request if (event instanceof MessageInboundEvent e) { - webhooksBusinessLogic.handleMessageInboundEvent(e); + serverBusinessLogic.handleMessageInboundEvent(e); } return ResponseEntity.ok().build(); diff --git a/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java b/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java index fbcc056fa..df3e30aa6 100644 --- a/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java +++ b/examples/getting-started/conversation/respond-to-incoming-message/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java @@ -10,8 +10,8 @@ import com.sinch.sdk.domains.conversation.models.v1.messages.request.SendMessageRequest; import com.sinch.sdk.domains.conversation.models.v1.messages.response.SendMessageResponse; import com.sinch.sdk.domains.conversation.models.v1.messages.types.text.TextMessage; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEventMessage; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventMessage; import java.util.logging.Logger; import org.springframework.stereotype.Component; diff --git a/examples/snippets/src/main/java/conversation/README.md b/examples/snippets/src/main/java/conversation/README.md index e7229f4ef..05b4c3991 100644 --- a/examples/snippets/src/main/java/conversation/README.md +++ b/examples/snippets/src/main/java/conversation/README.md @@ -46,15 +46,14 @@ See main [README.md](../../../../README.md) for how to execute snippets - [conversation/messages/Delete](./messages/Delete.java) - [conversation/messages/List](./messages/List.java) - [conversation/messages/ListLastMessagesByChannelIdentity](./messages/ListLastMessagesByChannelIdentity.java) - - Transcoding - [conversation/transcoding/Transcode](./transcoding/Transcode.java) -- Webhooks - - [conversation/webhooks/List](./webhooks/List.java) - - [conversation/webhooks/Create](./webhooks/Create.java) - - [conversation/webhooks/Get](./webhooks/Get.java) - - [conversation/webhooks/Update](./webhooks/Update.java) - - [conversation/webhooks/Delete](./webhooks/Delete.java) +- Event Destinations + - [conversation/eventdestinations/List](./eventdestinations/List.java) + - [conversation/eventdestinations/Create](./eventdestinations/Create.java) + - [conversation/eventdestinations/Get](./eventdestinations/Get.java) + - [conversation/eventdestinations/Update](./eventdestinations/Update.java) + - [conversation/eventdestinations/Delete](./eventdestinations/Delete.java) - Templates - V2 diff --git a/examples/snippets/src/main/java/conversation/webhooks/Create.java b/examples/snippets/src/main/java/conversation/eventdestinations/Create.java similarity index 59% rename from examples/snippets/src/main/java/conversation/webhooks/Create.java rename to examples/snippets/src/main/java/conversation/eventdestinations/Create.java index 7e6220a33..d8f2ac84e 100644 --- a/examples/snippets/src/main/java/conversation/webhooks/Create.java +++ b/examples/snippets/src/main/java/conversation/eventdestinations/Create.java @@ -5,13 +5,13 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package conversation.webhooks; +package conversation.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTrigger; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.request.CreateWebhookRequest; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTrigger; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request.EventDestinationCreateRequest; import com.sinch.sdk.models.Configuration; import com.sinch.sdk.models.ConversationRegion; import java.util.Arrays; @@ -29,7 +29,7 @@ public static void main(String[] args) { String keySecret = Settings.getKeySecret().orElse("MY_KEY_SECRET"); String conversationRegion = Settings.getConversationRegion().orElse("MY_CONVERSATION_REGION"); - // The ID of the conversation application to create the webhook for + // The ID of the conversation application to create the event destination for String conversationApplicationId = "APPLICATION_ID"; Configuration configuration = @@ -42,18 +42,19 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - WebhooksService webHooksService = client.conversation().v1().webhooks(); + EventDestinationsService eventDestinationsService = + client.conversation().v1().eventDestinations(); - CreateWebhookRequest webhookRequest = - CreateWebhookRequest.builder() + EventDestinationCreateRequest eventDestinationCreateRequest = + EventDestinationCreateRequest.builder() .setAppId(conversationApplicationId) .setTarget("https://foo.com") - .setTriggers(Arrays.asList(WebhookTrigger.CAPABILITY)) + .setTriggers(Arrays.asList(EventDestinationTrigger.CAPABILITY)) .build(); - LOGGER.info("Create webhook: " + webhookRequest); + LOGGER.info("Create event destination: " + eventDestinationCreateRequest); - Webhook response = webHooksService.create(webhookRequest); + EventDestination response = eventDestinationsService.create(eventDestinationCreateRequest); LOGGER.info("Response: " + response); } diff --git a/examples/snippets/src/main/java/conversation/webhooks/Delete.java b/examples/snippets/src/main/java/conversation/eventdestinations/Delete.java similarity index 72% rename from examples/snippets/src/main/java/conversation/webhooks/Delete.java rename to examples/snippets/src/main/java/conversation/eventdestinations/Delete.java index 55896c6e2..eb0967fae 100644 --- a/examples/snippets/src/main/java/conversation/webhooks/Delete.java +++ b/examples/snippets/src/main/java/conversation/eventdestinations/Delete.java @@ -5,10 +5,10 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package conversation.webhooks; +package conversation.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; import com.sinch.sdk.models.Configuration; import com.sinch.sdk.models.ConversationRegion; import java.util.logging.Logger; @@ -25,8 +25,8 @@ public static void main(String[] args) { String keySecret = Settings.getKeySecret().orElse("MY_KEY_SECRET"); String conversationRegion = Settings.getConversationRegion().orElse("MY_CONVERSATION_REGION"); - // The ID of the conversation webhook to delete - String conversationWebhookId = "WEBHOOK_ID"; + // The ID of the event destination to delete + String eventDestinationId = "EVENT_DESTINATION_ID"; Configuration configuration = Configuration.builder() @@ -38,11 +38,12 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - WebhooksService webHooksService = client.conversation().v1().webhooks(); + EventDestinationsService eventDestinationsService = + client.conversation().v1().eventDestinations(); - LOGGER.info("Deleting webhook: " + conversationWebhookId); + LOGGER.info("Deleting event destination: " + eventDestinationId); - webHooksService.delete(conversationWebhookId); + eventDestinationsService.delete(eventDestinationId); LOGGER.info("Done"); } diff --git a/examples/snippets/src/main/java/conversation/webhooks/Get.java b/examples/snippets/src/main/java/conversation/eventdestinations/Get.java similarity index 65% rename from examples/snippets/src/main/java/conversation/webhooks/Get.java rename to examples/snippets/src/main/java/conversation/eventdestinations/Get.java index 5088d379b..f22293547 100644 --- a/examples/snippets/src/main/java/conversation/webhooks/Get.java +++ b/examples/snippets/src/main/java/conversation/eventdestinations/Get.java @@ -5,11 +5,11 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package conversation.webhooks; +package conversation.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; import com.sinch.sdk.models.Configuration; import com.sinch.sdk.models.ConversationRegion; import java.util.logging.Logger; @@ -26,8 +26,8 @@ public static void main(String[] args) { String keySecret = Settings.getKeySecret().orElse("MY_KEY_SECRET"); String conversationRegion = Settings.getConversationRegion().orElse("MY_CONVERSATION_REGION"); - // The ID of the conversation webhook to retrieve - String conversationWebhookId = "WEBHOOK_ID"; + // The ID of the conversation event destination to retrieve + String eventDestinationId = "EVENT_DESTINATION_ID"; Configuration configuration = Configuration.builder() @@ -39,11 +39,13 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - WebhooksService webHooksService = client.conversation().v1().webhooks(); + EventDestinationsService eventDestinationsService = + client.conversation().v1().eventDestinations(); - LOGGER.info(String.format("Get information about webhook with ID '%s'", conversationWebhookId)); + LOGGER.info( + String.format("Get information about event destination with ID '%s'", eventDestinationId)); - Webhook response = webHooksService.get(conversationWebhookId); + EventDestination response = eventDestinationsService.get(eventDestinationId); LOGGER.info("Response: " + response); } diff --git a/examples/snippets/src/main/java/conversation/webhooks/List.java b/examples/snippets/src/main/java/conversation/eventdestinations/List.java similarity index 72% rename from examples/snippets/src/main/java/conversation/webhooks/List.java rename to examples/snippets/src/main/java/conversation/eventdestinations/List.java index 18c94ca66..626b7e39e 100644 --- a/examples/snippets/src/main/java/conversation/webhooks/List.java +++ b/examples/snippets/src/main/java/conversation/eventdestinations/List.java @@ -5,11 +5,11 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package conversation.webhooks; +package conversation.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.response.WebhooksListResponse; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response.EventDestinationsListResponse; import com.sinch.sdk.models.Configuration; import com.sinch.sdk.models.ConversationRegion; import java.util.logging.Logger; @@ -26,7 +26,7 @@ public static void main(String[] args) { String keySecret = Settings.getKeySecret().orElse("MY_KEY_SECRET"); String conversationRegion = Settings.getConversationRegion().orElse("MY_CONVERSATION_REGION"); - // The ID of the conversation application to list webhooks for + // The ID of the conversation application to list event destinations for String conversationApplicationId = "APPLICATION_ID"; Configuration configuration = @@ -39,11 +39,13 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - WebhooksService webHooksService = client.conversation().v1().webhooks(); + EventDestinationsService eventDestinationsService = + client.conversation().v1().eventDestinations(); LOGGER.info("List"); - WebhooksListResponse response = webHooksService.list(conversationApplicationId); + EventDestinationsListResponse response = + eventDestinationsService.list(conversationApplicationId); LOGGER.info("Response: "); response.iterator().forEachRemaining(f -> LOGGER.info(f.toString())); diff --git a/examples/snippets/src/main/java/conversation/webhooks/Update.java b/examples/snippets/src/main/java/conversation/eventdestinations/Update.java similarity index 55% rename from examples/snippets/src/main/java/conversation/webhooks/Update.java rename to examples/snippets/src/main/java/conversation/eventdestinations/Update.java index 8fc3eae85..a6816e79a 100644 --- a/examples/snippets/src/main/java/conversation/webhooks/Update.java +++ b/examples/snippets/src/main/java/conversation/eventdestinations/Update.java @@ -5,13 +5,13 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package conversation.webhooks; +package conversation.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTargetType; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTrigger; +import com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTargetType; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTrigger; import com.sinch.sdk.models.Configuration; import com.sinch.sdk.models.ConversationRegion; import java.util.Arrays; @@ -29,8 +29,8 @@ public static void main(String[] args) { String keySecret = Settings.getKeySecret().orElse("MY_KEY_SECRET"); String conversationRegion = Settings.getConversationRegion().orElse("MY_CONVERSATION_REGION"); - // The ID of the conversation webhook to update - String conversationWebhookId = "WEBHOOK_ID"; + // The ID of the conversation event destination to update + String eventDestinationId = "EVENT_DESTINATION_ID"; Configuration configuration = Configuration.builder() @@ -42,18 +42,22 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - WebhooksService webHooksService = client.conversation().v1().webhooks(); + EventDestinationsService eventDestinationsService = + client.conversation().v1().eventDestinations(); - Webhook webhookRequest = - Webhook.builder() + EventDestination eventDestination = + EventDestination.builder() .setTarget("https://foo.com") - .setTriggers(Arrays.asList(WebhookTrigger.CAPABILITY, WebhookTrigger.CHANNEL_EVENT)) - .setTargetType(WebhookTargetType.HTTP) + .setTriggers( + Arrays.asList( + EventDestinationTrigger.CAPABILITY, EventDestinationTrigger.CHANNEL_EVENT)) + .setTargetType(EventDestinationTargetType.HTTP) .build(); - LOGGER.info(String.format("Update webhook with ID '%s'", conversationWebhookId)); + LOGGER.info(String.format("Update event destination with ID '%s'", eventDestinationId)); - Webhook response = webHooksService.update(conversationWebhookId, webhookRequest); + EventDestination response = + eventDestinationsService.update(eventDestinationId, eventDestination); LOGGER.info("Response: " + response); } diff --git a/examples/webhooks/src/main/java/com/mycompany/app/conversation/Controller.java b/examples/webhooks/src/main/java/com/mycompany/app/conversation/Controller.java index a2cca09d1..bbb537489 100644 --- a/examples/webhooks/src/main/java/com/mycompany/app/conversation/Controller.java +++ b/examples/webhooks/src/main/java/com/mycompany/app/conversation/Controller.java @@ -1,29 +1,29 @@ package com.mycompany.app.conversation; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.conversation.api.v1.WebhooksService; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability.CapabilityEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.ChannelEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactCreateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactIdentitiesDuplicationEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactMergeEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactUpdateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStartEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStopEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.EventDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.MessageDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound.InboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageSubmitEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptInEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptOutEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record.RecordNotificationEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.MessageInboundSmartConversationRedactionEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.SmartConversationsEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported.UnsupportedCallbackEvent; +import com.sinch.sdk.domains.conversation.api.v1.SinchEventsService; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability.CapabilityEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.ChannelEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactCreateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactIdentitiesDuplicationEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactMergeEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactUpdateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStartEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStopEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.EventDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.MessageDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound.InboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageSubmitEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptInEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptOutEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.record.RecordNotificationEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.MessageInboundSmartConversationRedactionEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.SmartConversationsEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported.UnsupportedCallbackEvent; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -58,7 +58,7 @@ public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessL public ResponseEntity ConversationEvent( @RequestHeader Map headers, @RequestBody String body) { - WebhooksService webhooks = sinchClient.conversation().v1().webhooks(); + SinchEventsService webhooks = sinchClient.conversation().v1().sinchEvents(); // set this value to true to validate request from Sinch servers // see https://developers.sinch.com/docs/numbers/api-reference/numbers/tag/Numbers-Callbacks for @@ -75,7 +75,7 @@ public ResponseEntity ConversationEvent( } // decode the request payload - ConversationWebhookEvent event = webhooks.parseEvent(body); + ConversationSinchEvent event = webhooks.parseEvent(body); // let business layer process the request switch (event) { diff --git a/examples/webhooks/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java b/examples/webhooks/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java index f4a8458b3..8e88ff6ce 100644 --- a/examples/webhooks/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java +++ b/examples/webhooks/src/main/java/com/mycompany/app/conversation/ServerBusinessLogic.java @@ -1,26 +1,26 @@ package com.mycompany.app.conversation; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability.CapabilityEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.ChannelEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactCreateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactIdentitiesDuplicationEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactMergeEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactUpdateEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationDeleteEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStartEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStopEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.EventDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.MessageDeliveryReceiptEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound.InboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageSubmitEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptInEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptOutEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record.RecordNotificationEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.MessageInboundSmartConversationRedactionEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.SmartConversationsEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported.UnsupportedCallbackEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability.CapabilityEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.ChannelEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactCreateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactIdentitiesDuplicationEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactMergeEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactUpdateEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationDeleteEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStartEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStopEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.EventDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.MessageDeliveryReceiptEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound.InboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageSubmitEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptInEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptOutEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.record.RecordNotificationEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.MessageInboundSmartConversationRedactionEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.SmartConversationsEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported.UnsupportedCallbackEvent; import java.util.logging.Logger; import org.springframework.stereotype.Component; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/EventDestinationsService.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/EventDestinationsService.java new file mode 100644 index 000000000..2879ba420 --- /dev/null +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/EventDestinationsService.java @@ -0,0 +1,79 @@ +/* + * Conversation API | Sinch + * + * OpenAPI document version: 1.0 + * 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.conversation.api.v1; + +import com.sinch.sdk.core.exceptions.ApiException; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request.EventDestinationCreateRequest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response.EventDestinationsListResponse; + +/** Event Destinations Service */ +public interface EventDestinationsService { + + /** + * List webhooks + * + *

List all webhooks for a given app as specified by the App ID. + * + * @param appId The unique ID of the app. You can find this on the [Sinch + * Dashboard](https://dashboard.sinch.com/convapi/apps). (required) + * @return EventDestinationsListResponse + * @throws ApiException if fails to make API call + */ + EventDestinationsListResponse list(String appId) throws ApiException; + + /** + * Create a new webhook + * + *

Creates a webhook for receiving callbacks on specific triggers. You can create up to 5 + * webhooks per app. + * + * @param eventDestinationCreateRequest Required. The Webhook to create (required) + * @return EventDestination + * @throws ApiException if fails to make API call + */ + EventDestination create(EventDestinationCreateRequest eventDestinationCreateRequest) + throws ApiException; + + /** + * Delete an existing webhook + * + *

Deletes a webhook as specified by the webhook ID. + * + * @param eventDestinationId The unique ID of the webhook. (required) + * @throws ApiException if fails to make API call + */ + void delete(String eventDestinationId) throws ApiException; + + /** + * Get a webhook + * + *

Get a webhook as specified by the webhook ID. + * + * @param eventDestinationId The unique ID of the webhook. (required) + * @return EventDestination + * @throws ApiException if fails to make API call + */ + EventDestination get(String eventDestinationId) throws ApiException; + + /** + * Update an existing webhook + * + *

Updates an existing webhook as specified by the webhook ID. + * + * @param eventDestinationId The unique ID of the webhook. (required) + * @param eventDestination Required. The Webhook to update (required) + * @return EventDestination + * @throws ApiException if fails to make API call + */ + EventDestination update(String eventDestinationId, EventDestination eventDestination) + throws ApiException; +} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/WebhooksService.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/WebhooksService.java deleted file mode 100644 index 7c01d4aff..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/WebhooksService.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Conversation API | Sinch - * - * OpenAPI document version: 1.0 - * 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.conversation.api.v1; - -import com.sinch.sdk.core.exceptions.ApiException; -import com.sinch.sdk.core.exceptions.ApiMappingException; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.request.CreateWebhookRequest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.response.WebhooksListResponse; -import java.util.Map; - -/** Webhooks Service */ -public interface WebhooksService { - - /** - * List webhooks - * - *

List all webhooks for a given app as specified by the App ID. - * - * @param appId The unique ID of the app. You can find this on the [Sinch - * Dashboard](https://dashboard.sinch.com/convapi/apps). (required) - * @return WebhooksListResponse - * @throws ApiException if fails to make API call - */ - WebhooksListResponse list(String appId) throws ApiException; - - /** - * Create a new webhook - * - *

Creates a webhook for receiving callbacks on specific triggers. You can create up to 5 - * webhooks per app. - * - * @param createWebhookRequest Required. The Webhook to create (required) - * @return Webhook - * @throws ApiException if fails to make API call - */ - Webhook create(CreateWebhookRequest createWebhookRequest) throws ApiException; - - /** - * The Sinch Platform can initiate callback requests to a URL you define (Callback URL) on request - * and result events. All callback requests are signed and the signature is included in the - * Authorization header of the request - * - *

By using following function, you can ensure authentication according to received payload - * from your backend - * - * @param secret Secret token to be used to validate received request. See App's webhook configuration onto dashboard - * @param headers Received headers - * @param jsonPayload Received payload - * @return Is authentication is validated (true) or not (false) - *

see online - * documentation - * @since 1.3 - */ - boolean validateAuthenticationHeader( - String secret, Map headers, String jsonPayload); - - /** - * This function can be called to deserialize received payload onto callback onto proper java - * verification event class - * - * @param jsonPayload Received payload to be deserialized - * @return The verification event instance class - *

see triggered - * events - * @since 1.3 - */ - ConversationWebhookEvent parseEvent(String jsonPayload) throws ApiMappingException; - - /** - * Delete an existing webhook - * - *

Deletes a webhook as specified by the webhook ID. - * - * @param webhookId The unique ID of the webhook. (required) - * @throws ApiException if fails to make API call - */ - void delete(String webhookId) throws ApiException; - - /** - * Get a webhook - * - *

Get a webhook as specified by the webhook ID. - * - * @param webhookId The unique ID of the webhook. (required) - * @return Webhook - * @throws ApiException if fails to make API call - */ - Webhook get(String webhookId) throws ApiException; - - /** - * Update an existing webhook - * - *

Updates an existing webhook as specified by the webhook ID. - * - * @param webhookId The unique ID of the webhook. (required) - * @param webhook Required. The Webhook to update (required) - * @return Webhook - * @throws ApiException if fails to make API call - */ - Webhook update(String webhookId, Webhook webhook) throws ApiException; -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/WebhooksServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventDestinationsServiceImpl.java similarity index 68% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/WebhooksServiceImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventDestinationsServiceImpl.java index 97b9b8df7..372846226 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/WebhooksServiceImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventDestinationsServiceImpl.java @@ -10,12 +10,9 @@ package com.sinch.sdk.domains.conversation.api.v1.adapters; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.sinch.sdk.auth.HmacAuthenticationValidation; import com.sinch.sdk.core.exceptions.ApiException; import com.sinch.sdk.core.exceptions.ApiExceptionBuilder; -import com.sinch.sdk.core.exceptions.ApiMappingException; import com.sinch.sdk.core.http.AuthManager; import com.sinch.sdk.core.http.HttpClient; import com.sinch.sdk.core.http.HttpMapper; @@ -27,13 +24,10 @@ 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.core.utils.databind.Mapper; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.internal.WebhooksListResponseInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.request.CreateWebhookRequest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.response.WebhooksListResponse; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.internal.EventDestinationsListResponseInternal; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request.EventDestinationCreateRequest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response.EventDestinationsListResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -42,10 +36,11 @@ import java.util.Map; import java.util.logging.Logger; -public class WebhooksServiceImpl - implements com.sinch.sdk.domains.conversation.api.v1.WebhooksService { +public class EventDestinationsServiceImpl + implements com.sinch.sdk.domains.conversation.api.v1.EventDestinationsService { - private static final Logger LOGGER = Logger.getLogger(WebhooksServiceImpl.class.getName()); + private static final Logger LOGGER = + Logger.getLogger(EventDestinationsServiceImpl.class.getName()); private final HttpClient httpClient; private final ServerConfiguration serverConfiguration; private final Map authManagersByOasSecuritySchemes; @@ -53,25 +48,21 @@ public class WebhooksServiceImpl private final String projectId; - private final HmacAuthenticationValidation authenticationChecker; - - public WebhooksServiceImpl( + public EventDestinationsServiceImpl( HttpClient httpClient, ServerConfiguration serverConfiguration, Map authManagersByOasSecuritySchemes, HttpMapper mapper, - String projectId, - HmacAuthenticationValidation authenticationChecker) { + String projectId) { this.httpClient = httpClient; this.serverConfiguration = serverConfiguration; this.authManagersByOasSecuritySchemes = authManagersByOasSecuritySchemes; this.mapper = mapper; this.projectId = projectId; - this.authenticationChecker = authenticationChecker; } @Override - public WebhooksListResponse list(String appId) throws ApiException { + public EventDestinationsListResponse list(String appId) throws ApiException { LOGGER.finest("[list]" + " " + "appId: " + appId); @@ -79,17 +70,20 @@ public WebhooksListResponse list(String appId) throws ApiException { return _fetchListPage(httpRequest); } - private WebhooksListResponse _fetchListPage(HttpRequest httpRequest) throws ApiException { + private EventDestinationsListResponse _fetchListPage(HttpRequest httpRequest) + throws ApiException { HttpResponse response = httpClient.invokeAPI( this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest); if (HttpStatus.isSuccessfulStatus(response.getCode())) { - WebhooksListResponseInternal deserialized = - mapper.deserialize(response, new TypeReference() {}); + EventDestinationsListResponseInternal deserialized = + mapper.deserialize( + response, new TypeReference() {}); - return new WebhooksListResponse(new Page<>(deserialized.getWebhooks(), null)); + return new EventDestinationsListResponse( + new Page<>(deserialized.getEventDestinations(), null)); } // fallback to default errors handling: // all error cases definition are not required from specs: will try some "hardcoded" content @@ -141,17 +135,19 @@ private HttpRequest listRequestBuilder(String appId) throws ApiException { } @Override - public Webhook create(CreateWebhookRequest createWebhookRequest) throws ApiException { + public EventDestination create(EventDestinationCreateRequest eventDestinationCreateRequest) + throws ApiException { - LOGGER.finest("[create]" + " " + "createWebhookRequest: " + createWebhookRequest); + LOGGER.finest( + "[create]" + " " + "eventDestinationCreateRequest: " + eventDestinationCreateRequest); - HttpRequest httpRequest = createRequestBuilder(createWebhookRequest); + HttpRequest httpRequest = createRequestBuilder(eventDestinationCreateRequest); 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 @@ -162,17 +158,18 @@ public Webhook create(CreateWebhookRequest createWebhookRequest) throws ApiExcep mapper.deserialize(response, new TypeReference>() {})); } - private HttpRequest createRequestBuilder(CreateWebhookRequest createWebhookRequest) - throws ApiException { + private HttpRequest createRequestBuilder( + EventDestinationCreateRequest eventDestinationCreateRequest) throws ApiException { // verify the required parameter 'this.projectId' is set if (this.projectId == null) { throw new ApiException( 400, "Missing the required parameter 'this.projectId' when calling create"); } - // verify the required parameter 'createWebhookRequest' is set - if (createWebhookRequest == null) { + // verify the required parameter 'eventDestinationCreateRequest' is set + if (eventDestinationCreateRequest == null) { throw new ApiException( - 400, "Missing the required parameter 'createWebhookRequest' when calling create"); + 400, + "Missing the required parameter 'eventDestinationCreateRequest' when calling create"); } String localVarPath = @@ -190,7 +187,8 @@ private HttpRequest createRequestBuilder(CreateWebhookRequest createWebhookReque final Collection localVarContentTypes = Arrays.asList("application/json"); final Collection localVarAuthNames = Arrays.asList("Basic", "oAuth2"); - final String serializedBody = mapper.serialize(localVarContentTypes, createWebhookRequest); + final String serializedBody = + mapper.serialize(localVarContentTypes, eventDestinationCreateRequest); return new HttpRequest( localVarPath, @@ -204,29 +202,11 @@ private HttpRequest createRequestBuilder(CreateWebhookRequest createWebhookReque } @Override - public boolean validateAuthenticationHeader( - String secret, Map headers, String jsonPayload) { + public void delete(String eventDestinationId) throws ApiException { - return authenticationChecker.validateAuthenticationHeader(secret, headers, jsonPayload); - } - - @Override - public ConversationWebhookEvent parseEvent(String jsonPayload) throws ApiMappingException { - try { - ConversationEventInternalImpl dto = - Mapper.getInstance().readValue(jsonPayload, ConversationEventInternalImpl.class); - return (ConversationWebhookEvent) dto.getActualInstance(); - } catch (JsonProcessingException e) { - throw new ApiMappingException(jsonPayload, e); - } - } + LOGGER.finest("[delete]" + " " + "eventDestinationId: " + eventDestinationId); - @Override - public void delete(String webhookId) throws ApiException { - - LOGGER.finest("[delete]" + " " + "webhookId: " + webhookId); - - HttpRequest httpRequest = deleteRequestBuilder(webhookId); + HttpRequest httpRequest = deleteRequestBuilder(eventDestinationId); HttpResponse response = httpClient.invokeAPI( this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest); @@ -243,15 +223,16 @@ public void delete(String webhookId) throws ApiException { mapper.deserialize(response, new TypeReference>() {})); } - private HttpRequest deleteRequestBuilder(String webhookId) throws ApiException { + private HttpRequest deleteRequestBuilder(String eventDestinationId) throws ApiException { // verify the required parameter 'this.projectId' is set if (this.projectId == null) { throw new ApiException( 400, "Missing the required parameter 'this.projectId' when calling delete"); } - // verify the required parameter 'webhookId' is set - if (webhookId == null) { - throw new ApiException(400, "Missing the required parameter 'webhookId' when calling delete"); + // verify the required parameter 'eventDestinationId' is set + if (eventDestinationId == null) { + throw new ApiException( + 400, "Missing the required parameter 'eventDestinationId' when calling delete"); } String localVarPath = @@ -260,7 +241,8 @@ private HttpRequest deleteRequestBuilder(String webhookId) throws ApiException { "\\{" + "project_id" + "\\}", URLPathUtils.encodePathSegment(this.projectId.toString())) .replaceAll( - "\\{" + "webhook_id" + "\\}", URLPathUtils.encodePathSegment(webhookId.toString())); + "\\{" + "webhook_id" + "\\}", + URLPathUtils.encodePathSegment(eventDestinationId.toString())); List localVarQueryParams = new ArrayList<>(); @@ -285,17 +267,17 @@ private HttpRequest deleteRequestBuilder(String webhookId) throws ApiException { } @Override - public Webhook get(String webhookId) throws ApiException { + public EventDestination get(String eventDestinationId) throws ApiException { - LOGGER.finest("[get]" + " " + "webhookId: " + webhookId); + LOGGER.finest("[get]" + " " + "eventDestinationId: " + eventDestinationId); - HttpRequest httpRequest = getRequestBuilder(webhookId); + HttpRequest httpRequest = getRequestBuilder(eventDestinationId); 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 @@ -306,15 +288,16 @@ public Webhook get(String webhookId) throws ApiException { mapper.deserialize(response, new TypeReference>() {})); } - private HttpRequest getRequestBuilder(String webhookId) throws ApiException { + private HttpRequest getRequestBuilder(String eventDestinationId) throws ApiException { // verify the required parameter 'this.projectId' is set if (this.projectId == null) { throw new ApiException( 400, "Missing the required parameter 'this.projectId' when calling get"); } - // verify the required parameter 'webhookId' is set - if (webhookId == null) { - throw new ApiException(400, "Missing the required parameter 'webhookId' when calling get"); + // verify the required parameter 'eventDestinationId' is set + if (eventDestinationId == null) { + throw new ApiException( + 400, "Missing the required parameter 'eventDestinationId' when calling get"); } String localVarPath = @@ -323,7 +306,8 @@ private HttpRequest getRequestBuilder(String webhookId) throws ApiException { "\\{" + "project_id" + "\\}", URLPathUtils.encodePathSegment(this.projectId.toString())) .replaceAll( - "\\{" + "webhook_id" + "\\}", URLPathUtils.encodePathSegment(webhookId.toString())); + "\\{" + "webhook_id" + "\\}", + URLPathUtils.encodePathSegment(eventDestinationId.toString())); List localVarQueryParams = new ArrayList<>(); @@ -348,17 +332,25 @@ private HttpRequest getRequestBuilder(String webhookId) throws ApiException { } @Override - public Webhook update(String webhookId, Webhook webhook) throws ApiException { + public EventDestination update(String eventDestinationId, EventDestination eventDestination) + throws ApiException { - LOGGER.finest("[update]" + " " + "webhookId: " + webhookId + ", " + "webhook: " + webhook); + LOGGER.finest( + "[update]" + + " " + + "eventDestinationId: " + + eventDestinationId + + ", " + + "eventDestination: " + + eventDestination); - HttpRequest httpRequest = updateRequestBuilder(webhookId, webhook); + HttpRequest httpRequest = updateRequestBuilder(eventDestinationId, eventDestination); 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 @@ -369,19 +361,22 @@ public Webhook update(String webhookId, Webhook webhook) throws ApiException { mapper.deserialize(response, new TypeReference>() {})); } - private HttpRequest updateRequestBuilder(String webhookId, Webhook webhook) throws ApiException { + private HttpRequest updateRequestBuilder( + String eventDestinationId, EventDestination eventDestination) throws ApiException { // verify the required parameter 'this.projectId' is set if (this.projectId == null) { throw new ApiException( 400, "Missing the required parameter 'this.projectId' when calling update"); } - // verify the required parameter 'webhookId' is set - if (webhookId == null) { - throw new ApiException(400, "Missing the required parameter 'webhookId' when calling update"); + // verify the required parameter 'eventDestinationId' is set + if (eventDestinationId == null) { + throw new ApiException( + 400, "Missing the required parameter 'eventDestinationId' when calling update"); } - // verify the required parameter 'webhook' is set - if (webhook == null) { - throw new ApiException(400, "Missing the required parameter 'webhook' when calling update"); + // verify the required parameter 'eventDestination' is set + if (eventDestination == null) { + throw new ApiException( + 400, "Missing the required parameter 'eventDestination' when calling update"); } String localVarPath = @@ -390,7 +385,8 @@ private HttpRequest updateRequestBuilder(String webhookId, Webhook webhook) thro "\\{" + "project_id" + "\\}", URLPathUtils.encodePathSegment(this.projectId.toString())) .replaceAll( - "\\{" + "webhook_id" + "\\}", URLPathUtils.encodePathSegment(webhookId.toString())); + "\\{" + "webhook_id" + "\\}", + URLPathUtils.encodePathSegment(eventDestinationId.toString())); List localVarQueryParams = new ArrayList<>(); @@ -401,7 +397,7 @@ private HttpRequest updateRequestBuilder(String webhookId, Webhook webhook) thro final Collection localVarContentTypes = Arrays.asList("application/json"); final Collection localVarAuthNames = Arrays.asList("Basic", "oAuth2"); - final String serializedBody = mapper.serialize(localVarContentTypes, webhook); + final String serializedBody = mapper.serialize(localVarContentTypes, eventDestination); return new HttpRequest( localVarPath, diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/CallbackSettings.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettings.java similarity index 72% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/CallbackSettings.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettings.java index 33204a7e1..0f228c5d6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/CallbackSettings.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettings.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** This object contains additional settings related to callback processing. */ -@JsonDeserialize(builder = CallbackSettingsImpl.Builder.class) -public interface CallbackSettings { +@JsonDeserialize(builder = EventDestinationSettingsImpl.Builder.class) +public interface EventDestinationSettings { /** * Optional. Secret can be used to sign contents of delivery receipts for a message that was sent @@ -22,9 +22,9 @@ public interface CallbackSettings { * href="https://developers.sinch.com/docs/conversation/api-reference/conversation/tag/Messages/#tag/Messages/operation/Messages_SendMessage!path=callback_url&t=request"> * callback_url field). You can then use the secret to verify the signature. * - * @return secretForOverriddenCallbackUrls + * @return secretForOverriddenTarget */ - String getSecretForOverriddenCallbackUrls(); + String getSecretForOverriddenTarget(); /** * Getting builder @@ -32,7 +32,7 @@ public interface CallbackSettings { * @return New Builder instance */ static Builder builder() { - return new CallbackSettingsImpl.Builder(); + return new EventDestinationSettingsImpl.Builder(); } /** Dedicated Builder */ @@ -41,17 +41,17 @@ interface Builder { /** * see getter * - * @param secretForOverriddenCallbackUrls see getter + * @param secretForOverriddenTarget see getter * @return Current builder - * @see #getSecretForOverriddenCallbackUrls + * @see #getSecretForOverriddenTarget */ - Builder setSecretForOverriddenCallbackUrls(String secretForOverriddenCallbackUrls); + Builder setSecretForOverriddenTarget(String secretForOverriddenTarget); /** * Create instance * * @return The instance build with current builder values */ - CallbackSettings build(); + EventDestinationSettings build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/CallbackSettingsImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettingsImpl.java similarity index 54% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/CallbackSettingsImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettingsImpl.java index 670c6bfb6..28de8120f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/CallbackSettingsImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/EventDestinationSettingsImpl.java @@ -9,32 +9,32 @@ import com.sinch.sdk.core.models.OptionalValue; import java.util.Objects; -@JsonPropertyOrder({CallbackSettingsImpl.JSON_PROPERTY_SECRET_FOR_OVERRIDDEN_CALLBACK_URLS}) +@JsonPropertyOrder({EventDestinationSettingsImpl.JSON_PROPERTY_SECRET_FOR_OVERRIDDEN_CALLBACK_URLS}) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class CallbackSettingsImpl implements CallbackSettings { +public class EventDestinationSettingsImpl implements EventDestinationSettings { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_SECRET_FOR_OVERRIDDEN_CALLBACK_URLS = "secret_for_overridden_callback_urls"; - private OptionalValue secretForOverriddenCallbackUrls; + private OptionalValue secretForOverriddenTarget; - public CallbackSettingsImpl() {} + public EventDestinationSettingsImpl() {} - protected CallbackSettingsImpl(OptionalValue secretForOverriddenCallbackUrls) { - this.secretForOverriddenCallbackUrls = secretForOverriddenCallbackUrls; + protected EventDestinationSettingsImpl(OptionalValue secretForOverriddenTarget) { + this.secretForOverriddenTarget = secretForOverriddenTarget; } @JsonIgnore - public String getSecretForOverriddenCallbackUrls() { - return secretForOverriddenCallbackUrls.orElse(null); + public String getSecretForOverriddenTarget() { + return secretForOverriddenTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_SECRET_FOR_OVERRIDDEN_CALLBACK_URLS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue secretForOverriddenCallbackUrls() { - return secretForOverriddenCallbackUrls; + public OptionalValue secretForOverriddenTarget() { + return secretForOverriddenTarget; } /** Return true if this CallbackSettings object is equal to o. */ @@ -46,21 +46,21 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - CallbackSettingsImpl callbackSettings = (CallbackSettingsImpl) o; + EventDestinationSettingsImpl callbackSettings = (EventDestinationSettingsImpl) o; return Objects.equals( - this.secretForOverriddenCallbackUrls, callbackSettings.secretForOverriddenCallbackUrls); + this.secretForOverriddenTarget, callbackSettings.secretForOverriddenTarget); } @Override public int hashCode() { - return Objects.hash(secretForOverriddenCallbackUrls); + return Objects.hash(secretForOverriddenTarget); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class CallbackSettingsImpl {\n"); - sb.append(" secretForOverriddenCallbackUrls: ").append(toIndentedString("***")).append("\n"); + sb.append("class EventDestinationSettingsImpl {\n"); + sb.append(" secretForOverriddenTarget: ").append(toIndentedString("***")).append("\n"); sb.append("}"); return sb.toString(); } @@ -76,17 +76,17 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements CallbackSettings.Builder { - OptionalValue secretForOverriddenCallbackUrls = OptionalValue.empty(); + static class Builder implements EventDestinationSettings.Builder { + OptionalValue secretForOverriddenTarget = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_SECRET_FOR_OVERRIDDEN_CALLBACK_URLS) - public Builder setSecretForOverriddenCallbackUrls(String secretForOverriddenCallbackUrls) { - this.secretForOverriddenCallbackUrls = OptionalValue.of(secretForOverriddenCallbackUrls); + public Builder setSecretForOverriddenTarget(String secretForOverriddenTarget) { + this.secretForOverriddenTarget = OptionalValue.of(secretForOverriddenTarget); return this; } - public CallbackSettings build() { - return new CallbackSettingsImpl(secretForOverriddenCallbackUrls); + public EventDestinationSettings build() { + return new EventDestinationSettingsImpl(secretForOverriddenTarget); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequest.java index 92c4be48d..6e6429ab3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequest.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.apps.CallbackSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.ConversationMetadataReportView; import com.sinch.sdk.domains.conversation.models.v1.apps.DeliveryReportBasedFallback; import com.sinch.sdk.domains.conversation.models.v1.apps.DispatchRetentionPolicy; +import com.sinch.sdk.domains.conversation.models.v1.apps.EventDestinationSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.MessageRetrySettings; import com.sinch.sdk.domains.conversation.models.v1.apps.RetentionPolicy; import com.sinch.sdk.domains.conversation.models.v1.apps.SmartConversation; @@ -80,11 +80,11 @@ public interface AppCreateRequest { SmartConversation getSmartConversation(); /** - * Get callbackSettings + * Get eventDestinationSettings * - * @return callbackSettings + * @return eventDestinationSettings */ - CallbackSettings getCallbackSettings(); + EventDestinationSettings getEventDestinationSettings(); /** * Get messageRetrySettings @@ -179,11 +179,11 @@ Builder setConversationMetadataReportView( /** * see getter * - * @param callbackSettings see getter + * @param eventDestinationSettings see getter * @return Current builder - * @see #getCallbackSettings + * @see #getEventDestinationSettings */ - Builder setCallbackSettings(CallbackSettings callbackSettings); + Builder setEventDestinationSettings(EventDestinationSettings eventDestinationSettings); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequestImpl.java index 246565bd9..d7af9cc3e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppCreateRequestImpl.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.sinch.sdk.core.models.OptionalValue; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.apps.CallbackSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.ConversationMetadataReportView; import com.sinch.sdk.domains.conversation.models.v1.apps.DeliveryReportBasedFallback; import com.sinch.sdk.domains.conversation.models.v1.apps.DispatchRetentionPolicy; +import com.sinch.sdk.domains.conversation.models.v1.apps.EventDestinationSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.MessageRetrySettings; import com.sinch.sdk.domains.conversation.models.v1.apps.RetentionPolicy; import com.sinch.sdk.domains.conversation.models.v1.apps.SmartConversation; @@ -67,7 +67,7 @@ public class AppCreateRequestImpl implements AppCreateRequest { public static final String JSON_PROPERTY_CALLBACK_SETTINGS = "callback_settings"; - private OptionalValue callbackSettings; + private OptionalValue eventDestinationSettings; public static final String JSON_PROPERTY_MESSAGE_RETRY_SETTINGS = "message_retry_settings"; @@ -88,7 +88,7 @@ protected AppCreateRequestImpl( OptionalValue dispatchRetentionPolicy, OptionalValue processingMode, OptionalValue smartConversation, - OptionalValue callbackSettings, + OptionalValue eventDestinationSettings, OptionalValue messageRetrySettings, OptionalValue deliveryReportBasedFallback) { this.channelCredentials = channelCredentials; @@ -98,7 +98,7 @@ protected AppCreateRequestImpl( this.dispatchRetentionPolicy = dispatchRetentionPolicy; this.processingMode = processingMode; this.smartConversation = smartConversation; - this.callbackSettings = callbackSettings; + this.eventDestinationSettings = eventDestinationSettings; this.messageRetrySettings = messageRetrySettings; this.deliveryReportBasedFallback = deliveryReportBasedFallback; } @@ -181,14 +181,14 @@ public OptionalValue smartConversation() { } @JsonIgnore - public CallbackSettings getCallbackSettings() { - return callbackSettings.orElse(null); + public EventDestinationSettings getEventDestinationSettings() { + return eventDestinationSettings.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_SETTINGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackSettings() { - return callbackSettings; + public OptionalValue eventDestinationSettings() { + return eventDestinationSettings; } @JsonIgnore @@ -231,7 +231,7 @@ public boolean equals(Object o) { && Objects.equals(this.dispatchRetentionPolicy, appCreateRequest.dispatchRetentionPolicy) && Objects.equals(this.processingMode, appCreateRequest.processingMode) && Objects.equals(this.smartConversation, appCreateRequest.smartConversation) - && Objects.equals(this.callbackSettings, appCreateRequest.callbackSettings) + && Objects.equals(this.eventDestinationSettings, appCreateRequest.eventDestinationSettings) && Objects.equals(this.messageRetrySettings, appCreateRequest.messageRetrySettings) && Objects.equals( this.deliveryReportBasedFallback, appCreateRequest.deliveryReportBasedFallback); @@ -247,7 +247,7 @@ public int hashCode() { dispatchRetentionPolicy, processingMode, smartConversation, - callbackSettings, + eventDestinationSettings, messageRetrySettings, deliveryReportBasedFallback); } @@ -267,7 +267,9 @@ public String toString() { .append("\n"); sb.append(" processingMode: ").append(toIndentedString(processingMode)).append("\n"); sb.append(" smartConversation: ").append(toIndentedString(smartConversation)).append("\n"); - sb.append(" callbackSettings: ").append(toIndentedString(callbackSettings)).append("\n"); + sb.append(" eventDestinationSettings: ") + .append(toIndentedString(eventDestinationSettings)) + .append("\n"); sb.append(" messageRetrySettings: ") .append(toIndentedString(messageRetrySettings)) .append("\n"); @@ -298,7 +300,7 @@ static class Builder implements AppCreateRequest.Builder { OptionalValue dispatchRetentionPolicy = OptionalValue.empty(); OptionalValue processingMode = OptionalValue.empty(); OptionalValue smartConversation = OptionalValue.empty(); - OptionalValue callbackSettings = OptionalValue.empty(); + OptionalValue eventDestinationSettings = OptionalValue.empty(); OptionalValue messageRetrySettings = OptionalValue.empty(); OptionalValue deliveryReportBasedFallback = OptionalValue.empty(); @@ -346,8 +348,8 @@ public Builder setSmartConversation(SmartConversation smartConversation) { } @JsonProperty(JSON_PROPERTY_CALLBACK_SETTINGS) - public Builder setCallbackSettings(CallbackSettings callbackSettings) { - this.callbackSettings = OptionalValue.of(callbackSettings); + public Builder setEventDestinationSettings(EventDestinationSettings eventDestinationSettings) { + this.eventDestinationSettings = OptionalValue.of(eventDestinationSettings); return this; } @@ -373,7 +375,7 @@ public AppCreateRequest build() { dispatchRetentionPolicy, processingMode, smartConversation, - callbackSettings, + eventDestinationSettings, messageRetrySettings, deliveryReportBasedFallback); } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequest.java index 3cc4d0df1..ef19a5a01 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequest.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.apps.CallbackSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.ConversationMetadataReportView; import com.sinch.sdk.domains.conversation.models.v1.apps.DeliveryReportBasedFallback; import com.sinch.sdk.domains.conversation.models.v1.apps.DispatchRetentionPolicy; +import com.sinch.sdk.domains.conversation.models.v1.apps.EventDestinationSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.MessageRetrySettings; import com.sinch.sdk.domains.conversation.models.v1.apps.RetentionPolicy; import com.sinch.sdk.domains.conversation.models.v1.apps.SmartConversation; @@ -76,11 +76,11 @@ public interface AppUpdateRequest { SmartConversation getSmartConversation(); /** - * Get callbackSettings + * Get eventDestinationSettings * - * @return callbackSettings + * @return eventDestinationSettings */ - CallbackSettings getCallbackSettings(); + EventDestinationSettings getEventDestinationSettings(); /** * Get messageRetrySettings @@ -175,11 +175,11 @@ Builder setConversationMetadataReportView( /** * see getter * - * @param callbackSettings see getter + * @param eventDestinationSettings see getter * @return Current builder - * @see #getCallbackSettings + * @see #getEventDestinationSettings */ - Builder setCallbackSettings(CallbackSettings callbackSettings); + Builder setEventDestinationSettings(EventDestinationSettings eventDestinationSettings); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequestImpl.java index 2b02c859e..48b4c6d22 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/request/AppUpdateRequestImpl.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.sinch.sdk.core.models.OptionalValue; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.apps.CallbackSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.ConversationMetadataReportView; import com.sinch.sdk.domains.conversation.models.v1.apps.DeliveryReportBasedFallback; import com.sinch.sdk.domains.conversation.models.v1.apps.DispatchRetentionPolicy; +import com.sinch.sdk.domains.conversation.models.v1.apps.EventDestinationSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.MessageRetrySettings; import com.sinch.sdk.domains.conversation.models.v1.apps.RetentionPolicy; import com.sinch.sdk.domains.conversation.models.v1.apps.SmartConversation; @@ -67,7 +67,7 @@ public class AppUpdateRequestImpl implements AppUpdateRequest { public static final String JSON_PROPERTY_CALLBACK_SETTINGS = "callback_settings"; - private OptionalValue callbackSettings; + private OptionalValue eventDestinationSettings; public static final String JSON_PROPERTY_MESSAGE_RETRY_SETTINGS = "message_retry_settings"; @@ -88,7 +88,7 @@ protected AppUpdateRequestImpl( OptionalValue dispatchRetentionPolicy, OptionalValue processingMode, OptionalValue smartConversation, - OptionalValue callbackSettings, + OptionalValue eventDestinationSettings, OptionalValue messageRetrySettings, OptionalValue deliveryReportBasedFallback) { this.channelCredentials = channelCredentials; @@ -98,7 +98,7 @@ protected AppUpdateRequestImpl( this.dispatchRetentionPolicy = dispatchRetentionPolicy; this.processingMode = processingMode; this.smartConversation = smartConversation; - this.callbackSettings = callbackSettings; + this.eventDestinationSettings = eventDestinationSettings; this.messageRetrySettings = messageRetrySettings; this.deliveryReportBasedFallback = deliveryReportBasedFallback; } @@ -181,14 +181,14 @@ public OptionalValue smartConversation() { } @JsonIgnore - public CallbackSettings getCallbackSettings() { - return callbackSettings.orElse(null); + public EventDestinationSettings getEventDestinationSettings() { + return eventDestinationSettings.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_SETTINGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackSettings() { - return callbackSettings; + public OptionalValue eventDestinationSettings() { + return eventDestinationSettings; } @JsonIgnore @@ -231,7 +231,7 @@ public boolean equals(Object o) { && Objects.equals(this.dispatchRetentionPolicy, appUpdateRequest.dispatchRetentionPolicy) && Objects.equals(this.processingMode, appUpdateRequest.processingMode) && Objects.equals(this.smartConversation, appUpdateRequest.smartConversation) - && Objects.equals(this.callbackSettings, appUpdateRequest.callbackSettings) + && Objects.equals(this.eventDestinationSettings, appUpdateRequest.eventDestinationSettings) && Objects.equals(this.messageRetrySettings, appUpdateRequest.messageRetrySettings) && Objects.equals( this.deliveryReportBasedFallback, appUpdateRequest.deliveryReportBasedFallback); @@ -247,7 +247,7 @@ public int hashCode() { dispatchRetentionPolicy, processingMode, smartConversation, - callbackSettings, + eventDestinationSettings, messageRetrySettings, deliveryReportBasedFallback); } @@ -267,7 +267,9 @@ public String toString() { .append("\n"); sb.append(" processingMode: ").append(toIndentedString(processingMode)).append("\n"); sb.append(" smartConversation: ").append(toIndentedString(smartConversation)).append("\n"); - sb.append(" callbackSettings: ").append(toIndentedString(callbackSettings)).append("\n"); + sb.append(" eventDestinationSettings: ") + .append(toIndentedString(eventDestinationSettings)) + .append("\n"); sb.append(" messageRetrySettings: ") .append(toIndentedString(messageRetrySettings)) .append("\n"); @@ -298,7 +300,7 @@ static class Builder implements AppUpdateRequest.Builder { OptionalValue dispatchRetentionPolicy = OptionalValue.empty(); OptionalValue processingMode = OptionalValue.empty(); OptionalValue smartConversation = OptionalValue.empty(); - OptionalValue callbackSettings = OptionalValue.empty(); + OptionalValue eventDestinationSettings = OptionalValue.empty(); OptionalValue messageRetrySettings = OptionalValue.empty(); OptionalValue deliveryReportBasedFallback = OptionalValue.empty(); @@ -346,8 +348,8 @@ public Builder setSmartConversation(SmartConversation smartConversation) { } @JsonProperty(JSON_PROPERTY_CALLBACK_SETTINGS) - public Builder setCallbackSettings(CallbackSettings callbackSettings) { - this.callbackSettings = OptionalValue.of(callbackSettings); + public Builder setEventDestinationSettings(EventDestinationSettings eventDestinationSettings) { + this.eventDestinationSettings = OptionalValue.of(eventDestinationSettings); return this; } @@ -373,7 +375,7 @@ public AppUpdateRequest build() { dispatchRetentionPolicy, processingMode, smartConversation, - callbackSettings, + eventDestinationSettings, messageRetrySettings, deliveryReportBasedFallback); } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponse.java index b8c557d61..778a912f3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponse.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponse.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.apps.CallbackSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.ConversationMetadataReportView; import com.sinch.sdk.domains.conversation.models.v1.apps.DeliveryReportBasedFallback; import com.sinch.sdk.domains.conversation.models.v1.apps.DispatchRetentionPolicy; +import com.sinch.sdk.domains.conversation.models.v1.apps.EventDestinationSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.MessageRetrySettings; import com.sinch.sdk.domains.conversation.models.v1.apps.RetentionPolicy; import com.sinch.sdk.domains.conversation.models.v1.apps.SmartConversation; @@ -98,11 +98,11 @@ public interface AppResponse { QueueStats getQueueStats(); /** - * Get callbackSettings + * Get eventDestinationSettings * - * @return callbackSettings + * @return eventDestinationSettings */ - CallbackSettings getCallbackSettings(); + EventDestinationSettings getEventDestinationSettings(); /** * Get deliveryReportBasedFallback @@ -224,11 +224,11 @@ Builder setConversationMetadataReportView( /** * see getter * - * @param callbackSettings see getter + * @param eventDestinationSettings see getter * @return Current builder - * @see #getCallbackSettings + * @see #getEventDestinationSettings */ - Builder setCallbackSettings(CallbackSettings callbackSettings); + Builder setEventDestinationSettings(EventDestinationSettings eventDestinationSettings); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponseImpl.java index 50e8bedf4..bfcbe3d65 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponseImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/response/AppResponseImpl.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.sinch.sdk.core.models.OptionalValue; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.apps.CallbackSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.ConversationMetadataReportView; import com.sinch.sdk.domains.conversation.models.v1.apps.DeliveryReportBasedFallback; import com.sinch.sdk.domains.conversation.models.v1.apps.DispatchRetentionPolicy; +import com.sinch.sdk.domains.conversation.models.v1.apps.EventDestinationSettings; import com.sinch.sdk.domains.conversation.models.v1.apps.MessageRetrySettings; import com.sinch.sdk.domains.conversation.models.v1.apps.RetentionPolicy; import com.sinch.sdk.domains.conversation.models.v1.apps.SmartConversation; @@ -82,7 +82,7 @@ public class AppResponseImpl implements AppResponse { public static final String JSON_PROPERTY_CALLBACK_SETTINGS = "callback_settings"; - private OptionalValue callbackSettings; + private OptionalValue eventDestinationSettings; public static final String JSON_PROPERTY_DELIVERY_REPORT_BASED_FALLBACK = "delivery_report_based_fallback"; @@ -106,7 +106,7 @@ protected AppResponseImpl( OptionalValue processingMode, OptionalValue smartConversation, OptionalValue queueStats, - OptionalValue callbackSettings, + OptionalValue eventDestinationSettings, OptionalValue deliveryReportBasedFallback, OptionalValue messageRetrySettings) { this.channelCredentials = channelCredentials; @@ -119,7 +119,7 @@ protected AppResponseImpl( this.processingMode = processingMode; this.smartConversation = smartConversation; this.queueStats = queueStats; - this.callbackSettings = callbackSettings; + this.eventDestinationSettings = eventDestinationSettings; this.deliveryReportBasedFallback = deliveryReportBasedFallback; this.messageRetrySettings = messageRetrySettings; } @@ -235,14 +235,14 @@ public OptionalValue queueStats() { } @JsonIgnore - public CallbackSettings getCallbackSettings() { - return callbackSettings.orElse(null); + public EventDestinationSettings getEventDestinationSettings() { + return eventDestinationSettings.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_SETTINGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackSettings() { - return callbackSettings; + public OptionalValue eventDestinationSettings() { + return eventDestinationSettings; } @JsonIgnore @@ -288,7 +288,7 @@ public boolean equals(Object o) { && Objects.equals(this.processingMode, appResponse.processingMode) && Objects.equals(this.smartConversation, appResponse.smartConversation) && Objects.equals(this.queueStats, appResponse.queueStats) - && Objects.equals(this.callbackSettings, appResponse.callbackSettings) + && Objects.equals(this.eventDestinationSettings, appResponse.eventDestinationSettings) && Objects.equals(this.deliveryReportBasedFallback, appResponse.deliveryReportBasedFallback) && Objects.equals(this.messageRetrySettings, appResponse.messageRetrySettings); } @@ -306,7 +306,7 @@ public int hashCode() { processingMode, smartConversation, queueStats, - callbackSettings, + eventDestinationSettings, deliveryReportBasedFallback, messageRetrySettings); } @@ -329,7 +329,9 @@ public String toString() { sb.append(" processingMode: ").append(toIndentedString(processingMode)).append("\n"); sb.append(" smartConversation: ").append(toIndentedString(smartConversation)).append("\n"); sb.append(" queueStats: ").append(toIndentedString(queueStats)).append("\n"); - sb.append(" callbackSettings: ").append(toIndentedString(callbackSettings)).append("\n"); + sb.append(" eventDestinationSettings: ") + .append(toIndentedString(eventDestinationSettings)) + .append("\n"); sb.append(" deliveryReportBasedFallback: ") .append(toIndentedString(deliveryReportBasedFallback)) .append("\n"); @@ -363,7 +365,7 @@ static class Builder implements AppResponse.Builder { OptionalValue processingMode = OptionalValue.empty(); OptionalValue smartConversation = OptionalValue.empty(); OptionalValue queueStats = OptionalValue.empty(); - OptionalValue callbackSettings = OptionalValue.empty(); + OptionalValue eventDestinationSettings = OptionalValue.empty(); OptionalValue deliveryReportBasedFallback = OptionalValue.empty(); OptionalValue messageRetrySettings = OptionalValue.empty(); @@ -429,8 +431,8 @@ public Builder setQueueStats(QueueStats queueStats) { } @JsonProperty(JSON_PROPERTY_CALLBACK_SETTINGS) - public Builder setCallbackSettings(CallbackSettings callbackSettings) { - this.callbackSettings = OptionalValue.of(callbackSettings); + public Builder setEventDestinationSettings(EventDestinationSettings eventDestinationSettings) { + this.eventDestinationSettings = OptionalValue.of(eventDestinationSettings); return this; } @@ -459,7 +461,7 @@ public AppResponse build() { processingMode, smartConversation, queueStats, - callbackSettings, + eventDestinationSettings, deliveryReportBasedFallback, messageRetrySettings); } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentials.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentials.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java index 27f5b6959..b9496e1e8 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentials.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; 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/conversation/models/v1/webhooks/ClientCredentialsImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentialsImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentialsImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentialsImpl.java index 79f77d2bf..14ae424a6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentialsImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentialsImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/Webhook.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestination.java similarity index 86% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/Webhook.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestination.java index 4bf1e93c6..ff90dfc7f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/Webhook.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestination.java @@ -8,14 +8,14 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; /** Represents a destination for receiving callbacks from the Conversation API. */ -@JsonDeserialize(builder = WebhookImpl.Builder.class) -public interface Webhook { +@JsonDeserialize(builder = EventDestinationImpl.Builder.class) +public interface EventDestination { /** * The app that this webhook belongs to. @@ -62,7 +62,7 @@ public interface Webhook { * * @return targetType */ - WebhookTargetType getTargetType(); + EventDestinationTargetType getTargetType(); /** * An array of triggers that should trigger the webhook and result in an event being sent to the @@ -72,7 +72,7 @@ public interface Webhook { * * @return triggers */ - List getTriggers(); + List getTriggers(); /** * Getting builder @@ -80,7 +80,7 @@ public interface Webhook { * @return New Builder instance */ static Builder builder() { - return new WebhookImpl.Builder(); + return new EventDestinationImpl.Builder(); } /** Dedicated Builder */ @@ -139,7 +139,7 @@ interface Builder { * @return Current builder * @see #getTargetType */ - Builder setTargetType(WebhookTargetType targetType); + Builder setTargetType(EventDestinationTargetType targetType); /** * see getter @@ -148,13 +148,13 @@ interface Builder { * @return Current builder * @see #getTriggers */ - Builder setTriggers(List triggers); + Builder setTriggers(List triggers); /** * Create instance * * @return The instance build with current builder values */ - Webhook build(); + EventDestination build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationImpl.java similarity index 79% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationImpl.java index f73f0bed7..5e4756273 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,17 +11,17 @@ import java.util.Objects; @JsonPropertyOrder({ - WebhookImpl.JSON_PROPERTY_APP_ID, - WebhookImpl.JSON_PROPERTY_CLIENT_CREDENTIALS, - WebhookImpl.JSON_PROPERTY_ID, - WebhookImpl.JSON_PROPERTY_SECRET, - WebhookImpl.JSON_PROPERTY_TARGET, - WebhookImpl.JSON_PROPERTY_TARGET_TYPE, - WebhookImpl.JSON_PROPERTY_TRIGGERS + EventDestinationImpl.JSON_PROPERTY_APP_ID, + EventDestinationImpl.JSON_PROPERTY_CLIENT_CREDENTIALS, + EventDestinationImpl.JSON_PROPERTY_ID, + EventDestinationImpl.JSON_PROPERTY_SECRET, + EventDestinationImpl.JSON_PROPERTY_TARGET, + EventDestinationImpl.JSON_PROPERTY_TARGET_TYPE, + EventDestinationImpl.JSON_PROPERTY_TRIGGERS }) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class WebhookImpl implements Webhook { +public class EventDestinationImpl implements EventDestination { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; @@ -46,22 +46,22 @@ public class WebhookImpl implements Webhook { public static final String JSON_PROPERTY_TARGET_TYPE = "target_type"; - private OptionalValue targetType; + private OptionalValue targetType; public static final String JSON_PROPERTY_TRIGGERS = "triggers"; - private OptionalValue> triggers; + private OptionalValue> triggers; - public WebhookImpl() {} + public EventDestinationImpl() {} - protected WebhookImpl( + protected EventDestinationImpl( OptionalValue appId, OptionalValue clientCredentials, OptionalValue id, OptionalValue secret, OptionalValue target, - OptionalValue targetType, - OptionalValue> triggers) { + OptionalValue targetType, + OptionalValue> triggers) { this.appId = appId; this.clientCredentials = clientCredentials; this.id = id; @@ -126,24 +126,24 @@ public OptionalValue target() { } @JsonIgnore - public WebhookTargetType getTargetType() { + public EventDestinationTargetType getTargetType() { return targetType.orElse(null); } @JsonProperty(JSON_PROPERTY_TARGET_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue targetType() { + public OptionalValue targetType() { return targetType; } @JsonIgnore - public List getTriggers() { + public List getTriggers() { return triggers.orElse(null); } @JsonProperty(JSON_PROPERTY_TRIGGERS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue> triggers() { + public OptionalValue> triggers() { return triggers; } @@ -156,7 +156,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - WebhookImpl webhook = (WebhookImpl) o; + EventDestinationImpl webhook = (EventDestinationImpl) o; return Objects.equals(this.appId, webhook.appId) && Objects.equals(this.clientCredentials, webhook.clientCredentials) && Objects.equals(this.id, webhook.id) @@ -174,7 +174,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class WebhookImpl {\n"); + sb.append("class EventDestinationImpl {\n"); sb.append(" appId: ").append(toIndentedString(appId)).append("\n"); sb.append(" clientCredentials: ").append(toIndentedString(clientCredentials)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); @@ -197,14 +197,14 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements Webhook.Builder { + static class Builder implements EventDestination.Builder { OptionalValue appId = OptionalValue.empty(); OptionalValue clientCredentials = OptionalValue.empty(); OptionalValue id = OptionalValue.empty(); OptionalValue secret = OptionalValue.empty(); OptionalValue target = OptionalValue.empty(); - OptionalValue targetType = OptionalValue.empty(); - OptionalValue> triggers = OptionalValue.empty(); + OptionalValue targetType = OptionalValue.empty(); + OptionalValue> triggers = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_APP_ID) public Builder setAppId(String appId) { @@ -237,19 +237,20 @@ public Builder setTarget(String target) { } @JsonProperty(JSON_PROPERTY_TARGET_TYPE) - public Builder setTargetType(WebhookTargetType targetType) { + public Builder setTargetType(EventDestinationTargetType targetType) { this.targetType = OptionalValue.of(targetType); return this; } @JsonProperty(JSON_PROPERTY_TRIGGERS) - public Builder setTriggers(List triggers) { + public Builder setTriggers(List triggers) { this.triggers = OptionalValue.of(triggers); return this; } - public Webhook build() { - return new WebhookImpl(appId, clientCredentials, id, secret, target, targetType, triggers); + public EventDestination build() { + return new EventDestinationImpl( + appId, clientCredentials, id, secret, target, targetType, triggers); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationTargetType.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationTargetType.java new file mode 100644 index 000000000..ab4aab54b --- /dev/null +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationTargetType.java @@ -0,0 +1,39 @@ +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; + +import com.sinch.sdk.core.utils.EnumDynamic; +import com.sinch.sdk.core.utils.EnumSupportDynamic; +import java.util.Arrays; +import java.util.stream.Stream; + +/** Gets or Sets WebhookTargetType */ +public class EventDestinationTargetType extends EnumDynamic { + + /** Events won't be sent. */ + public static final EventDestinationTargetType DISMISS = + new EventDestinationTargetType("DISMISS"); + + /** Events will be sent to an HTTP target. */ + public static final EventDestinationTargetType HTTP = new EventDestinationTargetType("HTTP"); + + private static final EnumSupportDynamic ENUM_SUPPORT = + new EnumSupportDynamic<>( + EventDestinationTargetType.class, + EventDestinationTargetType::new, + Arrays.asList(DISMISS, HTTP)); + + private EventDestinationTargetType(String value) { + super(value); + } + + public static Stream values() { + return ENUM_SUPPORT.values(); + } + + public static EventDestinationTargetType from(String value) { + return ENUM_SUPPORT.from(value); + } + + public static String valueOf(EventDestinationTargetType e) { + return ENUM_SUPPORT.valueOf(e); + } +} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationTrigger.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationTrigger.java new file mode 100644 index 000000000..1cf202a70 --- /dev/null +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationTrigger.java @@ -0,0 +1,149 @@ +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; + +import com.sinch.sdk.core.utils.EnumDynamic; +import com.sinch.sdk.core.utils.EnumSupportDynamic; +import java.util.Arrays; +import java.util.stream.Stream; + +/** Each webhook can subscribe to one or more of the following triggers */ +public class EventDestinationTrigger extends EnumDynamic { + + /** Using this value will cause errors. */ + public static final EventDestinationTrigger UNSPECIFIED_TRIGGER = + new EventDestinationTrigger("UNSPECIFIED_TRIGGER"); + + /** Subscribe to delivery receipts for a message sent. */ + public static final EventDestinationTrigger MESSAGE_DELIVERY = + new EventDestinationTrigger("MESSAGE_DELIVERY"); + + /** Subscribe to delivery receipts for a event sent. */ + public static final EventDestinationTrigger EVENT_DELIVERY = + new EventDestinationTrigger("EVENT_DELIVERY"); + + /** Subscribe to inbound messages from end users on the underlying channels. */ + public static final EventDestinationTrigger MESSAGE_INBOUND = + new EventDestinationTrigger("MESSAGE_INBOUND"); + + /** Subscribe to inbound events from end users on the underlying channels. */ + public static final EventDestinationTrigger EVENT_INBOUND = + new EventDestinationTrigger("EVENT_INBOUND"); + + /** Subscribe to an event that is triggered when a new conversation has been started. */ + public static final EventDestinationTrigger CONVERSATION_START = + new EventDestinationTrigger("CONVERSATION_START"); + + /** Subscribe to an event that is triggered when a active conversation has been stopped. */ + public static final EventDestinationTrigger CONVERSATION_STOP = + new EventDestinationTrigger("CONVERSATION_STOP"); + + /** Subscribe to an event that is triggered when a new contact has been created. */ + public static final EventDestinationTrigger CONTACT_CREATE = + new EventDestinationTrigger("CONTACT_CREATE"); + + /** Subscribe to an event that is triggered when a contact has been deleted. */ + public static final EventDestinationTrigger CONTACT_DELETE = + new EventDestinationTrigger("CONTACT_DELETE"); + + /** Subscribe to an event that is triggered when a two contacts are merged. */ + public static final EventDestinationTrigger CONTACT_MERGE = + new EventDestinationTrigger("CONTACT_MERGE"); + + /** Subscribe to an event that is triggered when a contact is updated. */ + public static final EventDestinationTrigger CONTACT_UPDATE = + new EventDestinationTrigger("CONTACT_UPDATE"); + + /** Subscribe to callbacks that are not natively supported by the Conversation API. */ + public static final EventDestinationTrigger UNSUPPORTED = + new EventDestinationTrigger("UNSUPPORTED"); + + /** Subscribe to opt_ins. */ + public static final EventDestinationTrigger OPT_IN = new EventDestinationTrigger("OPT_IN"); + + /** Subscribe to opt_outs. */ + public static final EventDestinationTrigger OPT_OUT = new EventDestinationTrigger("OPT_OUT"); + + /** Subscribe to see get capability results. */ + public static final EventDestinationTrigger CAPABILITY = + new EventDestinationTrigger("CAPABILITY"); + + /** Subscribe to get an event when a conversation is deleted. */ + public static final EventDestinationTrigger CONVERSATION_DELETE = + new EventDestinationTrigger("CONVERSATION_DELETE"); + + /** + * Subscribe to get an event when contact identity duplications are found during message or event + * processing. + */ + public static final EventDestinationTrigger CONTACT_IDENTITIES_DUPLICATION = + new EventDestinationTrigger("CONTACT_IDENTITIES_DUPLICATION"); + + /** Subscribe to direct channel event. */ + public static final EventDestinationTrigger CHANNEL_EVENT = + new EventDestinationTrigger("CHANNEL_EVENT"); + + /** + * Subscribe to Smart conversation + * analysis. + */ + public static final EventDestinationTrigger SMART_CONVERSATION = + new EventDestinationTrigger("SMART_CONVERSATION"); + + /** + * Subscribe to analysis for + * messages from end-users. + */ + public static final EventDestinationTrigger MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION = + new EventDestinationTrigger("MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION"); + + /** Subscribe to Record Notifications. */ + public static final EventDestinationTrigger RECORD_NOTIFICATION = + new EventDestinationTrigger("RECORD_NOTIFICATION"); + + /** Subscribe to message submit Notifications. */ + public static final EventDestinationTrigger MESSAGE_SUBMIT = + new EventDestinationTrigger("MESSAGE_SUBMIT"); + + private static final EnumSupportDynamic ENUM_SUPPORT = + new EnumSupportDynamic<>( + EventDestinationTrigger.class, + EventDestinationTrigger::new, + Arrays.asList( + UNSPECIFIED_TRIGGER, + MESSAGE_DELIVERY, + EVENT_DELIVERY, + MESSAGE_INBOUND, + EVENT_INBOUND, + CONVERSATION_START, + CONVERSATION_STOP, + CONTACT_CREATE, + CONTACT_DELETE, + CONTACT_MERGE, + CONTACT_UPDATE, + UNSUPPORTED, + OPT_IN, + OPT_OUT, + CAPABILITY, + CONVERSATION_DELETE, + CONTACT_IDENTITIES_DUPLICATION, + CHANNEL_EVENT, + SMART_CONVERSATION, + MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION, + RECORD_NOTIFICATION, + MESSAGE_SUBMIT)); + + private EventDestinationTrigger(String value) { + super(value); + } + + public static Stream values() { + return ENUM_SUPPORT.values(); + } + + public static EventDestinationTrigger from(String value) { + return ENUM_SUPPORT.from(value); + } + + public static String valueOf(EventDestinationTrigger e) { + return ENUM_SUPPORT.valueOf(e); + } +} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/internal/WebhooksListResponseInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/internal/EventDestinationsListResponseInternal.java similarity index 51% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/internal/WebhooksListResponseInternal.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/internal/EventDestinationsListResponseInternal.java index a260c17df..7067b7eb6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/internal/WebhooksListResponseInternal.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/internal/EventDestinationsListResponseInternal.java @@ -8,22 +8,22 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.internal; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.internal; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; import java.util.List; -/** WebhooksListResponseInternal */ -@JsonDeserialize(builder = WebhooksListResponseInternalImpl.Builder.class) -public interface WebhooksListResponseInternal { +/** EventDestinationsListResponseInternal */ +@JsonDeserialize(builder = EventDestinationsListResponseInternalImpl.Builder.class) +public interface EventDestinationsListResponseInternal { /** * List of webhooks belonging to a specific project ID and app ID * - * @return webhooks + * @return eventDestinations */ - List getWebhooks(); + List getEventDestinations(); /** * Getting builder @@ -31,7 +31,7 @@ public interface WebhooksListResponseInternal { * @return New Builder instance */ static Builder builder() { - return new WebhooksListResponseInternalImpl.Builder(); + return new EventDestinationsListResponseInternalImpl.Builder(); } /** Dedicated Builder */ @@ -40,17 +40,17 @@ interface Builder { /** * see getter * - * @param webhooks see getter + * @param eventDestinations see getter * @return Current builder - * @see #getWebhooks + * @see #getEventDestinations */ - Builder setWebhooks(List webhooks); + Builder setEventDestinations(List eventDestinations); /** * Create instance * * @return The instance build with current builder values */ - WebhooksListResponseInternal build(); + EventDestinationsListResponseInternal build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/internal/EventDestinationsListResponseInternalImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/internal/EventDestinationsListResponseInternalImpl.java new file mode 100644 index 000000000..f193e0d08 --- /dev/null +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/internal/EventDestinationsListResponseInternalImpl.java @@ -0,0 +1,95 @@ +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.internal; + +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.conversation.models.v1.eventdestinations.EventDestination; +import java.util.List; +import java.util.Objects; + +@JsonPropertyOrder({EventDestinationsListResponseInternalImpl.JSON_PROPERTY_WEBHOOKS}) +@JsonFilter("uninitializedFilter") +@JsonInclude(value = JsonInclude.Include.CUSTOM) +public class EventDestinationsListResponseInternalImpl + implements EventDestinationsListResponseInternal { + private static final long serialVersionUID = 1L; + + public static final String JSON_PROPERTY_WEBHOOKS = "webhooks"; + + private OptionalValue> eventDestinations; + + public EventDestinationsListResponseInternalImpl() {} + + protected EventDestinationsListResponseInternalImpl( + OptionalValue> eventDestinations) { + this.eventDestinations = eventDestinations; + } + + @JsonIgnore + public List getEventDestinations() { + return eventDestinations.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_WEBHOOKS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OptionalValue> eventDestinations() { + return eventDestinations; + } + + /** Return true if this ListWebhooksResponse object is equal to o. */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + EventDestinationsListResponseInternalImpl listWebhooksResponse = + (EventDestinationsListResponseInternalImpl) o; + return Objects.equals(this.eventDestinations, listWebhooksResponse.eventDestinations); + } + + @Override + public int hashCode() { + return Objects.hash(eventDestinations); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class EventDestinationsListResponseInternalImpl {\n"); + sb.append(" eventDestinations: ").append(toIndentedString(eventDestinations)).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 EventDestinationsListResponseInternal.Builder { + OptionalValue> eventDestinations = OptionalValue.empty(); + + @JsonProperty(JSON_PROPERTY_WEBHOOKS) + public Builder setEventDestinations(List eventDestinations) { + this.eventDestinations = OptionalValue.of(eventDestinations); + return this; + } + + public EventDestinationsListResponseInternal build() { + return new EventDestinationsListResponseInternalImpl(eventDestinations); + } + } +} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/EventDestinationCreateRequest.java similarity index 76% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequest.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/EventDestinationCreateRequest.java index 09c11453e..3a26e8289 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/EventDestinationCreateRequest.java @@ -8,17 +8,17 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.request; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.ClientCredentials; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTargetType; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTrigger; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.ClientCredentials; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTargetType; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTrigger; import java.util.List; -/** CreateWebhookRequest */ -@JsonDeserialize(builder = CreateWebhookRequestImpl.Builder.class) -public interface CreateWebhookRequest { +/** EventDestinationCreateRequest */ +@JsonDeserialize(builder = EventDestinationCreateRequestImpl.Builder.class) +public interface EventDestinationCreateRequest { /** * The app that this webhook belongs to. @@ -67,7 +67,7 @@ public interface CreateWebhookRequest { * * @return targetType */ - WebhookTargetType getTargetType(); + EventDestinationTargetType getTargetType(); /** * An array of triggers that should trigger the webhook and result in an event being sent to the @@ -77,7 +77,7 @@ public interface CreateWebhookRequest { * * @return triggers */ - List getTriggers(); + List getTriggers(); /** * Getting builder @@ -85,7 +85,7 @@ public interface CreateWebhookRequest { * @return New Builder instance */ static Builder builder() { - return new CreateWebhookRequestImpl.Builder(); + return new EventDestinationCreateRequestImpl.Builder(); } /** Dedicated Builder */ @@ -134,7 +134,7 @@ interface Builder { * @return Current builder * @see #getTargetType */ - Builder setTargetType(WebhookTargetType targetType); + Builder setTargetType(EventDestinationTargetType targetType); /** * see getter @@ -143,13 +143,13 @@ interface Builder { * @return Current builder * @see #getTriggers */ - Builder setTriggers(List triggers); + Builder setTriggers(List triggers); /** * Create instance * * @return The instance build with current builder values */ - CreateWebhookRequest build(); + EventDestinationCreateRequest build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/EventDestinationCreateRequestImpl.java similarity index 75% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequestImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/EventDestinationCreateRequestImpl.java index 25636aa60..792599862 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/request/CreateWebhookRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/request/EventDestinationCreateRequestImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.request; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -7,24 +7,24 @@ 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.conversation.models.v1.webhooks.ClientCredentials; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTargetType; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookTrigger; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.ClientCredentials; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTargetType; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationTrigger; import java.util.List; import java.util.Objects; @JsonPropertyOrder({ - CreateWebhookRequestImpl.JSON_PROPERTY_APP_ID, - CreateWebhookRequestImpl.JSON_PROPERTY_CLIENT_CREDENTIALS, - CreateWebhookRequestImpl.JSON_PROPERTY_ID, - CreateWebhookRequestImpl.JSON_PROPERTY_SECRET, - CreateWebhookRequestImpl.JSON_PROPERTY_TARGET, - CreateWebhookRequestImpl.JSON_PROPERTY_TARGET_TYPE, - CreateWebhookRequestImpl.JSON_PROPERTY_TRIGGERS + EventDestinationCreateRequestImpl.JSON_PROPERTY_APP_ID, + EventDestinationCreateRequestImpl.JSON_PROPERTY_CLIENT_CREDENTIALS, + EventDestinationCreateRequestImpl.JSON_PROPERTY_ID, + EventDestinationCreateRequestImpl.JSON_PROPERTY_SECRET, + EventDestinationCreateRequestImpl.JSON_PROPERTY_TARGET, + EventDestinationCreateRequestImpl.JSON_PROPERTY_TARGET_TYPE, + EventDestinationCreateRequestImpl.JSON_PROPERTY_TRIGGERS }) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class CreateWebhookRequestImpl implements CreateWebhookRequest { +public class EventDestinationCreateRequestImpl implements EventDestinationCreateRequest { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; @@ -49,22 +49,22 @@ public class CreateWebhookRequestImpl implements CreateWebhookRequest { public static final String JSON_PROPERTY_TARGET_TYPE = "target_type"; - private OptionalValue targetType; + private OptionalValue targetType; public static final String JSON_PROPERTY_TRIGGERS = "triggers"; - private OptionalValue> triggers; + private OptionalValue> triggers; - public CreateWebhookRequestImpl() {} + public EventDestinationCreateRequestImpl() {} - protected CreateWebhookRequestImpl( + protected EventDestinationCreateRequestImpl( OptionalValue appId, OptionalValue clientCredentials, OptionalValue id, OptionalValue secret, OptionalValue target, - OptionalValue targetType, - OptionalValue> triggers) { + OptionalValue targetType, + OptionalValue> triggers) { this.appId = appId; this.clientCredentials = clientCredentials; this.id = id; @@ -129,24 +129,24 @@ public OptionalValue target() { } @JsonIgnore - public WebhookTargetType getTargetType() { + public EventDestinationTargetType getTargetType() { return targetType.orElse(null); } @JsonProperty(JSON_PROPERTY_TARGET_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue targetType() { + public OptionalValue targetType() { return targetType; } @JsonIgnore - public List getTriggers() { + public List getTriggers() { return triggers.orElse(null); } @JsonProperty(JSON_PROPERTY_TRIGGERS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue> triggers() { + public OptionalValue> triggers() { return triggers; } @@ -159,7 +159,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - CreateWebhookRequestImpl webhooksCreateWebhookRequest = (CreateWebhookRequestImpl) o; + EventDestinationCreateRequestImpl webhooksCreateWebhookRequest = + (EventDestinationCreateRequestImpl) o; return Objects.equals(this.appId, webhooksCreateWebhookRequest.appId) && Objects.equals(this.clientCredentials, webhooksCreateWebhookRequest.clientCredentials) && Objects.equals(this.id, webhooksCreateWebhookRequest.id) @@ -177,7 +178,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class CreateWebhookRequestImpl {\n"); + sb.append("class EventDestinationCreateRequestImpl {\n"); sb.append(" appId: ").append(toIndentedString(appId)).append("\n"); sb.append(" clientCredentials: ").append(toIndentedString(clientCredentials)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); @@ -200,14 +201,14 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements CreateWebhookRequest.Builder { + static class Builder implements EventDestinationCreateRequest.Builder { OptionalValue appId = OptionalValue.empty(); OptionalValue clientCredentials = OptionalValue.empty(); OptionalValue id = OptionalValue.empty(); OptionalValue secret = OptionalValue.empty(); OptionalValue target = OptionalValue.empty(); - OptionalValue targetType = OptionalValue.empty(); - OptionalValue> triggers = OptionalValue.empty(); + OptionalValue targetType = OptionalValue.empty(); + OptionalValue> triggers = OptionalValue.empty(); @JsonProperty(value = JSON_PROPERTY_APP_ID, required = true) public Builder setAppId(String appId) { @@ -240,19 +241,19 @@ public Builder setTarget(String target) { } @JsonProperty(JSON_PROPERTY_TARGET_TYPE) - public Builder setTargetType(WebhookTargetType targetType) { + public Builder setTargetType(EventDestinationTargetType targetType) { this.targetType = OptionalValue.of(targetType); return this; } @JsonProperty(JSON_PROPERTY_TRIGGERS) - public Builder setTriggers(List triggers) { + public Builder setTriggers(List triggers) { this.triggers = OptionalValue.of(triggers); return this; } - public CreateWebhookRequest build() { - return new CreateWebhookRequestImpl( + public EventDestinationCreateRequest build() { + return new EventDestinationCreateRequestImpl( appId, clientCredentials, id, secret, target, targetType, triggers); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/WebhooksListResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponse.java similarity index 52% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/WebhooksListResponse.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponse.java index 425b756ae..295eb2c37 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/WebhooksListResponse.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponse.java @@ -8,20 +8,20 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.response; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response; import com.sinch.sdk.core.models.pagination.ListResponse; import com.sinch.sdk.core.models.pagination.Page; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.Webhook; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestination; import java.util.Collection; import java.util.Collections; -/** Auto paginated response for list of Webhook */ -public class WebhooksListResponse extends ListResponse { +/** Auto paginated response for list of EventDestination */ +public class EventDestinationsListResponse extends ListResponse { - private final Page page; + private final Page page; - public WebhooksListResponse(Page page) { + public EventDestinationsListResponse(Page page) { this.page = page; } @@ -31,17 +31,17 @@ public boolean hasNextPage() { } @Override - public WebhooksListResponse nextPage() { + public EventDestinationsListResponse nextPage() { return null; } @Override - public Collection getContent() { + public Collection getContent() { return page == null ? Collections.emptyList() : page.getEntities(); } @Override public String toString() { - return "WebhooksListResponse {" + "page=" + page + '}'; + return "EventDestinationsListResponse {" + "page=" + page + '}'; } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequest.java index c7e7338f5..4172d5855 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequest.java @@ -34,9 +34,9 @@ public interface SendEventRequest { * Overwrites the default callback url for delivery receipts for this message The REST URL should * be of the form: http://host[:port]/path * - * @return callbackUrl + * @return eventDestinationTarget */ - String getCallbackUrl(); + String getEventDestinationTarget(); /** * Optional. A single element array that dictates on what channel should the Conversation API try @@ -103,11 +103,11 @@ interface Builder { /** * see getter * - * @param callbackUrl see getter + * @param eventDestinationTarget see getter * @return Current builder - * @see #getCallbackUrl + * @see #getEventDestinationTarget */ - Builder setCallbackUrl(String callbackUrl); + Builder setEventDestinationTarget(String eventDestinationTarget); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestImpl.java index 92362094e..8852f0338 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestImpl.java @@ -34,7 +34,7 @@ public class SendEventRequestImpl implements SendEventRequest { public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url"; - private OptionalValue callbackUrl; + private OptionalValue eventDestinationTarget; public static final String JSON_PROPERTY_CHANNEL_PRIORITY_ORDER = "channel_priority_order"; @@ -60,14 +60,14 @@ public SendEventRequestImpl() {} protected SendEventRequestImpl( OptionalValue appId, - OptionalValue callbackUrl, + OptionalValue eventDestinationTarget, OptionalValue> channelPriorityOrder, OptionalValue event, OptionalValue eventMetadata, OptionalValue queue, OptionalValue recipient) { this.appId = appId; - this.callbackUrl = callbackUrl; + this.eventDestinationTarget = eventDestinationTarget; this.channelPriorityOrder = channelPriorityOrder; this.event = event; this.eventMetadata = eventMetadata; @@ -87,14 +87,14 @@ public OptionalValue appId() { } @JsonIgnore - public String getCallbackUrl() { - return callbackUrl.orElse(null); + public String getEventDestinationTarget() { + return eventDestinationTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackUrl() { - return callbackUrl; + public OptionalValue eventDestinationTarget() { + return eventDestinationTarget; } @JsonIgnore @@ -163,7 +163,7 @@ public boolean equals(Object o) { } SendEventRequestImpl sendEventRequest = (SendEventRequestImpl) o; return Objects.equals(this.appId, sendEventRequest.appId) - && Objects.equals(this.callbackUrl, sendEventRequest.callbackUrl) + && Objects.equals(this.eventDestinationTarget, sendEventRequest.eventDestinationTarget) && Objects.equals(this.channelPriorityOrder, sendEventRequest.channelPriorityOrder) && Objects.equals(this.event, sendEventRequest.event) && Objects.equals(this.eventMetadata, sendEventRequest.eventMetadata) @@ -174,7 +174,13 @@ public boolean equals(Object o) { @Override public int hashCode() { return Objects.hash( - appId, callbackUrl, channelPriorityOrder, event, eventMetadata, queue, recipient); + appId, + eventDestinationTarget, + channelPriorityOrder, + event, + eventMetadata, + queue, + recipient); } @Override @@ -182,7 +188,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SendEventRequestImpl {\n"); sb.append(" appId: ").append(toIndentedString(appId)).append("\n"); - sb.append(" callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n"); + sb.append(" eventDestinationTarget: ") + .append(toIndentedString(eventDestinationTarget)) + .append("\n"); sb.append(" channelPriorityOrder: ") .append(toIndentedString(channelPriorityOrder)) .append("\n"); @@ -207,7 +215,7 @@ private String toIndentedString(Object o) { @JsonPOJOBuilder(withPrefix = "set") static class Builder implements SendEventRequest.Builder { OptionalValue appId = OptionalValue.empty(); - OptionalValue callbackUrl = OptionalValue.empty(); + OptionalValue eventDestinationTarget = OptionalValue.empty(); OptionalValue> channelPriorityOrder = OptionalValue.empty(); OptionalValue event = OptionalValue.empty(); OptionalValue eventMetadata = OptionalValue.empty(); @@ -221,8 +229,8 @@ public Builder setAppId(String appId) { } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) - public Builder setCallbackUrl(String callbackUrl) { - this.callbackUrl = OptionalValue.of(callbackUrl); + public Builder setEventDestinationTarget(String eventDestinationTarget) { + this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget); return this; } @@ -258,7 +266,13 @@ public Builder setRecipient(Recipient recipient) { public SendEventRequest build() { return new SendEventRequestImpl( - appId, callbackUrl, channelPriorityOrder, event, eventMetadata, queue, recipient); + appId, + eventDestinationTarget, + channelPriorityOrder, + event, + eventMetadata, + queue, + recipient); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequest.java index cfcee83d4..d239aa700 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequest.java @@ -43,9 +43,9 @@ public interface SendMessageRequest { * used to sign the contents of delivery receipts when the default callback URL is overridden by * this property. The REST URL should be of the form: http://host[:port]/path * - * @return callbackUrl + * @return eventDestinationTarget */ - String getCallbackUrl(); + String getEventDestinationTarget(); /** * Explicitly define the channels and order in which they are tried when sending the message. All @@ -203,11 +203,11 @@ interface Builder { /** * see getter * - * @param callbackUrl see getter + * @param eventDestinationTarget see getter * @return Current builder - * @see #getCallbackUrl + * @see #getEventDestinationTarget */ - Builder setCallbackUrl(String callbackUrl); + Builder setEventDestinationTarget(String eventDestinationTarget); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequestImpl.java index 3ecfc6bfb..e1aee92d6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageRequestImpl.java @@ -43,7 +43,7 @@ public class SendMessageRequestImpl implements SendMes public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url"; - private OptionalValue callbackUrl; + private OptionalValue eventDestinationTarget; public static final String JSON_PROPERTY_CHANNEL_PRIORITY_ORDER = "channel_priority_order"; @@ -98,7 +98,7 @@ public SendMessageRequestImpl() {} protected SendMessageRequestImpl( OptionalValue appId, - OptionalValue callbackUrl, + OptionalValue eventDestinationTarget, OptionalValue> channelPriorityOrder, OptionalValue> channelProperties, OptionalValue> message, @@ -112,7 +112,7 @@ protected SendMessageRequestImpl( OptionalValue conversationMetadataUpdateStrategy, OptionalValue messageContentType) { this.appId = appId; - this.callbackUrl = callbackUrl; + this.eventDestinationTarget = eventDestinationTarget; this.channelPriorityOrder = channelPriorityOrder; this.channelProperties = channelProperties; this.message = message; @@ -139,14 +139,14 @@ public OptionalValue appId() { } @JsonIgnore - public String getCallbackUrl() { - return callbackUrl.orElse(null); + public String getEventDestinationTarget() { + return eventDestinationTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackUrl() { - return callbackUrl; + public OptionalValue eventDestinationTarget() { + return eventDestinationTarget; } @JsonIgnore @@ -292,7 +292,7 @@ public boolean equals(Object o) { } SendMessageRequestImpl sendMessageRequest = (SendMessageRequestImpl) o; return Objects.equals(this.appId, sendMessageRequest.appId) - && Objects.equals(this.callbackUrl, sendMessageRequest.callbackUrl) + && Objects.equals(this.eventDestinationTarget, sendMessageRequest.eventDestinationTarget) && Objects.equals(this.channelPriorityOrder, sendMessageRequest.channelPriorityOrder) && Objects.equals(this.channelProperties, sendMessageRequest.channelProperties) && Objects.equals(this.message, sendMessageRequest.message) @@ -313,7 +313,7 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash( appId, - callbackUrl, + eventDestinationTarget, channelPriorityOrder, channelProperties, message, @@ -333,7 +333,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SendMessageRequestImpl {\n"); sb.append(" appId: ").append(toIndentedString(appId)).append("\n"); - sb.append(" callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n"); + sb.append(" eventDestinationTarget: ") + .append(toIndentedString(eventDestinationTarget)) + .append("\n"); sb.append(" channelPriorityOrder: ") .append(toIndentedString(channelPriorityOrder)) .append("\n"); @@ -369,7 +371,7 @@ private String toIndentedString(Object o) { @JsonPOJOBuilder(withPrefix = "set") static class Builder implements SendMessageRequest.Builder { OptionalValue appId = OptionalValue.empty(); - OptionalValue callbackUrl = OptionalValue.empty(); + OptionalValue eventDestinationTarget = OptionalValue.empty(); OptionalValue> channelPriorityOrder = OptionalValue.empty(); OptionalValue> channelProperties = OptionalValue.empty(); OptionalValue> message = OptionalValue.empty(); @@ -391,8 +393,8 @@ public Builder setAppId(String appId) { } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) - public Builder setCallbackUrl(String callbackUrl) { - this.callbackUrl = OptionalValue.of(callbackUrl); + public Builder setEventDestinationTarget(String eventDestinationTarget) { + this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget); return this; } @@ -473,7 +475,7 @@ public Builder setMessageContentType(MessageContentType messageContentType) { public SendMessageRequest build() { return new SendMessageRequestImpl( appId, - callbackUrl, + eventDestinationTarget, channelPriorityOrder, channelProperties, message, diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/ConversationWebhookEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/ConversationSinchEvent.java similarity index 92% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/ConversationWebhookEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/ConversationSinchEvent.java index fba67670b..d83e39e33 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/ConversationWebhookEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/ConversationSinchEvent.java @@ -8,12 +8,12 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents; import java.time.Instant; -/** ConversationWebhookEvent */ -public interface ConversationWebhookEvent { +/** ConversationSinchEvent */ +public interface ConversationSinchEvent { /** * Id of the subscribed app. @@ -120,6 +120,6 @@ interface Builder { * * @return The instance build with current builder values */ - ConversationWebhookEvent build(); + ConversationSinchEvent build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEvent.java index bbd19f057..46e23b744 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is used to deliver the results of the asynchronous capability checks. */ @JsonDeserialize(builder = CapabilityEventImpl.Builder.class) public interface CapabilityEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventImpl.java index b10bcdfbb..8b3952c2c 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class CapabilityEventImpl implements CapabilityEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java index a1033abcc..776831862 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability; 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/conversation/models/v1/webhooks/events/capability/CapabilityEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotificationImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotificationImpl.java index 650bda4a6..3133b86d0 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEvent.java index 748b7b378..343d3b05b 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -20,7 +20,7 @@ */ @JsonDeserialize(builder = ChannelEventImpl.Builder.class) public interface ChannelEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventImpl.java index 2e2f6da05..886a2493c 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ChannelEventImpl implements ChannelEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventNotification.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventNotification.java index 88bee338f..b43d92d29 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventNotificationImpl.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventNotificationImpl.java index d8fabd351..3cd1368a5 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.sinch.sdk.core.models.OptionalValue; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.internal.ChannelEventNotificationChannelEvent; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.internal.ChannelEventNotificationChannelEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.internal.ChannelEventNotificationChannelEvent; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.internal.ChannelEventNotificationChannelEventImpl; import java.io.IOException; import java.util.Objects; import java.util.Optional; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/internal/ChannelEventNotificationChannelEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/internal/ChannelEventNotificationChannelEvent.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/internal/ChannelEventNotificationChannelEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/internal/ChannelEventNotificationChannelEvent.java index 997adfdcd..96c4e94fc 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/internal/ChannelEventNotificationChannelEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/internal/ChannelEventNotificationChannelEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.internal; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.internal; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/internal/ChannelEventNotificationChannelEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/internal/ChannelEventNotificationChannelEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/internal/ChannelEventNotificationChannelEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/internal/ChannelEventNotificationChannelEventImpl.java index a5f09586f..42174eb55 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/internal/ChannelEventNotificationChannelEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/internal/ChannelEventNotificationChannelEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.internal; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.internal; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEvent.java index 7cb32b78f..5ff69f69f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is sent when a new contact is created. */ @JsonDeserialize(builder = ContactCreateEventImpl.Builder.class) public interface ContactCreateEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEventImpl.java index 751fb3834..d3cef7bc6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ContactCreateEventImpl implements ContactCreateEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEvent.java index a99075386..0a76a3bb4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is sent when a new contact is deleted. */ @JsonDeserialize(builder = ContactDeleteEventImpl.Builder.class) public interface ContactDeleteEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEventImpl.java index 2b9a4fa22..96355c6ca 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ContactDeleteEventImpl implements ContactDeleteEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEvent.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEvent.java index f3ab2a10c..ff39bb7d9 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -20,7 +20,7 @@ */ @JsonDeserialize(builder = ContactIdentitiesDuplicationEventImpl.Builder.class) public interface ContactIdentitiesDuplicationEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEventImpl.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEventImpl.java index 37665411a..379d5caf6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.sinch.sdk.core.models.OptionalValue; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.internal.DuplicatedContactIdentitiesNotificationInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.internal.DuplicatedContactIdentitiesNotificationInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.internal.DuplicatedContactIdentitiesNotificationInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.internal.DuplicatedContactIdentitiesNotificationInternalImpl; import java.io.IOException; import java.time.Instant; import java.util.List; @@ -34,7 +34,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ContactIdentitiesDuplicationEventImpl implements ContactIdentitiesDuplicationEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEvent.java index 7a9ae9646..fde86e8a3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is sent when two contacts are merged. */ @JsonDeserialize(builder = ContactMergeEventImpl.Builder.class) public interface ContactMergeEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventImpl.java index 4340c6d3d..16321830b 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ContactMergeEventImpl implements ContactMergeEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventNotification.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventNotification.java index 59a4dfca3..8e7937ef6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.contacts.Contact; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventNotificationImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventNotificationImpl.java index 937f118a6..872b3b01d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactNotification.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactNotification.java index 3f61cea32..7440d4823 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.contacts.Contact; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactNotificationImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactNotificationImpl.java index a96ea58bf..721d4283a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEvent.java index 248b31ef8..2d1b68871 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is sent when a new contact is updated. */ @JsonDeserialize(builder = ContactUpdateEventImpl.Builder.class) public interface ContactUpdateEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEventImpl.java index 1f29b44d0..2f0fcb34e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ContactUpdateEventImpl implements ContactUpdateEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/DuplicatedIdentities.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/DuplicatedIdentities.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/DuplicatedIdentities.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/DuplicatedIdentities.java index 736af9094..a807e7427 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/DuplicatedIdentities.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/DuplicatedIdentities.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/DuplicatedIdentitiesImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/DuplicatedIdentitiesImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/DuplicatedIdentitiesImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/DuplicatedIdentitiesImpl.java index e5f0130ae..5c53c3c06 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/DuplicatedIdentitiesImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/DuplicatedIdentitiesImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/internal/DuplicatedContactIdentitiesNotificationInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/internal/DuplicatedContactIdentitiesNotificationInternal.java similarity index 87% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/internal/DuplicatedContactIdentitiesNotificationInternal.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/internal/DuplicatedContactIdentitiesNotificationInternal.java index 2a1c177e1..43b121c9f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/internal/DuplicatedContactIdentitiesNotificationInternal.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/internal/DuplicatedContactIdentitiesNotificationInternal.java @@ -8,10 +8,10 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.internal; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.internal; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.DuplicatedIdentities; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.DuplicatedIdentities; import java.util.List; /** DuplicatedContactIdentitiesNotificationInternal */ diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/internal/DuplicatedContactIdentitiesNotificationInternalImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/internal/DuplicatedContactIdentitiesNotificationInternalImpl.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/internal/DuplicatedContactIdentitiesNotificationInternalImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/internal/DuplicatedContactIdentitiesNotificationInternalImpl.java index 4a8557b07..8a67aa190 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/internal/DuplicatedContactIdentitiesNotificationInternalImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/internal/DuplicatedContactIdentitiesNotificationInternalImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.internal; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.internal; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -7,7 +7,7 @@ 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.conversation.models.v1.webhooks.events.contact.DuplicatedIdentities; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.DuplicatedIdentities; import java.util.List; import java.util.Objects; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEvent.java index 47e950c4c..ed68730ac 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -18,7 +18,7 @@ */ @JsonDeserialize(builder = ConversationDeleteEventImpl.Builder.class) public interface ConversationDeleteEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEventImpl.java index 9863280bb..fb2d49429 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ConversationDeleteEventImpl implements ConversationDeleteEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationNotification.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationNotification.java index 46e934c6f..bdc929281 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.conversations.Conversation; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationNotificationImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationNotificationImpl.java index 79cf62cdb..21474f6b4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEvent.java index c92d91706..f07d7b486 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -19,7 +19,7 @@ */ @JsonDeserialize(builder = ConversationStartEventImpl.Builder.class) public interface ConversationStartEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEventImpl.java index 1868ffe57..344dea9ff 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ConversationStartEventImpl implements ConversationStartEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEvent.java index d5f2b2f60..c945b8a84 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -18,7 +18,7 @@ */ @JsonDeserialize(builder = ConversationStopEventImpl.Builder.class) public interface ConversationStopEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEventImpl.java index d646a6ff8..ffa420d2c 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class ConversationStopEventImpl implements ConversationStopEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/DeliveryStatus.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/DeliveryStatus.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/DeliveryStatus.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/DeliveryStatus.java index b4b82aa5a..3e1ff8740 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/DeliveryStatus.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/DeliveryStatus.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.sinch.sdk.core.utils.EnumDynamic; import com.sinch.sdk.core.utils.EnumSupportDynamic; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEvent.java index af6365a51..069a22c18 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** EventDeliveryReceiptEvent */ @JsonDeserialize(builder = EventDeliveryReceiptEventImpl.Builder.class) public interface EventDeliveryReceiptEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEventImpl.java index 8bc4fef0b..6cc02ad2b 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class EventDeliveryReceiptEventImpl implements EventDeliveryReceiptEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReport.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReport.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReport.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReport.java index 3d0c9a812..11539df3d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReport.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReport.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentity; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReportImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReportImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReportImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReportImpl.java index dc9e4ef54..6923a0670 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReportImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReportImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEvent.java index 57c00143a..752ae69c2 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback notifies the API clients about status changes of already sent app message. */ @JsonDeserialize(builder = MessageDeliveryReceiptEventImpl.Builder.class) public interface MessageDeliveryReceiptEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEventImpl.java index e259f7167..1d4376be3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class MessageDeliveryReceiptEventImpl implements MessageDeliveryReceiptEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReport.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReport.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReport.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReport.java index bade08ebd..5b123a3d3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReport.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReport.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentity; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReportImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReportImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReportImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReportImpl.java index 4518c8688..6ace2b6b3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReportImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReportImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/Event.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/Event.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java index c7856393e..3b18fbeaa 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/Event.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound; 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/conversation/models/v1/webhooks/events/inbound/EventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/EventImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/EventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/EventImpl.java index b55f51afc..287d8d624 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/EventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/EventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEvent.java index c18d6cce2..3e335c5f2 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** InboundEvent */ @JsonDeserialize(builder = InboundEventImpl.Builder.class) public interface InboundEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEventImpl.java index 411828065..76f8f88b1 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class InboundEventImpl implements InboundEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/internal/ConversationEventInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/internal/ConversationSinchEventInternal.java similarity index 58% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/internal/ConversationEventInternal.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/internal/ConversationSinchEventInternal.java index 129757acf..45fdd388f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/internal/ConversationEventInternal.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/internal/ConversationSinchEventInternal.java @@ -8,10 +8,10 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize( - using = ConversationEventInternalImpl.ConversationEventInternalImplDeserializer.class) -public interface ConversationEventInternal {} + using = ConversationSinchEventInternalImpl.ConversationSinchEventInternalImplDeserializer.class) +public interface ConversationSinchEventInternal {} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/internal/ConversationEventInternalImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/internal/ConversationSinchEventInternalImpl.java similarity index 92% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/internal/ConversationEventInternalImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/internal/ConversationSinchEventInternalImpl.java index a917ec808..798af7456 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/internal/ConversationEventInternalImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/internal/ConversationSinchEventInternalImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -15,27 +15,27 @@ 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.conversation.models.v1.webhooks.events.capability.CapabilityEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel.ChannelEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactCreateEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactDeleteEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactIdentitiesDuplicationEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactMergeEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact.ContactUpdateEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationDeleteEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStartEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation.ConversationStopEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.EventDeliveryReceiptEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery.MessageDeliveryReceiptEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound.InboundEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageSubmitEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptInEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptOutEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record.RecordNotificationEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.MessageInboundSmartConversationRedactionEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.SmartConversationsEventImpl; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported.UnsupportedCallbackEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability.CapabilityEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel.ChannelEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactCreateEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactDeleteEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactIdentitiesDuplicationEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactMergeEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact.ContactUpdateEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationDeleteEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStartEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation.ConversationStopEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.EventDeliveryReceiptEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery.MessageDeliveryReceiptEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound.InboundEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageSubmitEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptInEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptOutEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.record.RecordNotificationEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.MessageInboundSmartConversationRedactionEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.SmartConversationsEventImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported.UnsupportedCallbackEventImpl; import java.io.IOException; import java.util.Collections; import java.util.HashMap; @@ -45,48 +45,51 @@ import java.util.logging.Logger; @JsonDeserialize( - using = ConversationEventInternalImpl.ConversationEventInternalImplDeserializer.class) -@JsonSerialize(using = ConversationEventInternalImpl.ConversationEventInternalImplSerializer.class) -public class ConversationEventInternalImpl extends AbstractOpenApiSchema - implements ConversationEventInternal { - private static final Logger log = Logger.getLogger(ConversationEventInternalImpl.class.getName()); - - public static final class ConversationEventInternalImplSerializer - extends StdSerializer { + using = ConversationSinchEventInternalImpl.ConversationSinchEventInternalImplDeserializer.class) +@JsonSerialize( + using = ConversationSinchEventInternalImpl.ConversationSinchEventInternalImplSerializer.class) +public class ConversationSinchEventInternalImpl extends AbstractOpenApiSchema + implements ConversationSinchEventInternal { + private static final Logger log = + Logger.getLogger(ConversationSinchEventInternalImpl.class.getName()); + + public static final class ConversationSinchEventInternalImplSerializer + extends StdSerializer { private static final long serialVersionUID = 1L; - public ConversationEventInternalImplSerializer(Class t) { + public ConversationSinchEventInternalImplSerializer( + Class t) { super(t); } - public ConversationEventInternalImplSerializer() { + public ConversationSinchEventInternalImplSerializer() { this(null); } @Override public void serialize( - ConversationEventInternalImpl value, JsonGenerator jgen, SerializerProvider provider) + ConversationSinchEventInternalImpl value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { jgen.writeObject(value.getActualInstance()); } } - public static final class ConversationEventInternalImplDeserializer - extends StdDeserializer { + public static final class ConversationSinchEventInternalImplDeserializer + extends StdDeserializer { private static final long serialVersionUID = 1L; - public ConversationEventInternalImplDeserializer() { - this(ConversationEventInternalImpl.class); + public ConversationSinchEventInternalImplDeserializer() { + this(ConversationSinchEventInternalImpl.class); } - public ConversationEventInternalImplDeserializer(Class vc) { + public ConversationSinchEventInternalImplDeserializer(Class vc) { super(vc); } @Override - public ConversationEventInternalImpl deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public ConversationSinchEventInternalImpl deserialize( + JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; boolean typeCoercion = ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS); @@ -969,134 +972,134 @@ public ConversationEventInternalImpl deserialize(JsonParser jp, DeserializationC } if (match == 1) { - ConversationEventInternalImpl ret = new ConversationEventInternalImpl(); + ConversationSinchEventInternalImpl ret = new ConversationSinchEventInternalImpl(); ret.setActualInstance(deserialized); return ret; } throw new IOException( String.format( - "Failed deserialization for ConversationEventInternalImpl: %d classes match result," - + " expected 1", + "Failed deserialization for ConversationSinchEventInternalImpl: %d classes match" + + " result, expected 1", match)); } /** Handle deserialization of the 'null' value. */ @Override - public ConversationEventInternalImpl getNullValue(DeserializationContext ctxt) + public ConversationSinchEventInternalImpl getNullValue(DeserializationContext ctxt) throws JsonMappingException { throw new JsonMappingException( - ctxt.getParser(), "ConversationEventInternalImpl cannot be null"); + ctxt.getParser(), "ConversationSinchEventInternalImpl cannot be null"); } } // store a list of schema names defined in oneOf public static final Map> schemas = new HashMap<>(); - public ConversationEventInternalImpl() { + public ConversationSinchEventInternalImpl() { super("oneOf", Boolean.FALSE); } - public ConversationEventInternalImpl(CapabilityEventImpl o) { + public ConversationSinchEventInternalImpl(CapabilityEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ChannelEventImpl o) { + public ConversationSinchEventInternalImpl(ChannelEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ContactCreateEventImpl o) { + public ConversationSinchEventInternalImpl(ContactCreateEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ContactDeleteEventImpl o) { + public ConversationSinchEventInternalImpl(ContactDeleteEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ContactIdentitiesDuplicationEventImpl o) { + public ConversationSinchEventInternalImpl(ContactIdentitiesDuplicationEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ContactMergeEventImpl o) { + public ConversationSinchEventInternalImpl(ContactMergeEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ContactUpdateEventImpl o) { + public ConversationSinchEventInternalImpl(ContactUpdateEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ConversationDeleteEventImpl o) { + public ConversationSinchEventInternalImpl(ConversationDeleteEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ConversationStartEventImpl o) { + public ConversationSinchEventInternalImpl(ConversationStartEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(ConversationStopEventImpl o) { + public ConversationSinchEventInternalImpl(ConversationStopEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(EventDeliveryReceiptEventImpl o) { + public ConversationSinchEventInternalImpl(EventDeliveryReceiptEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(InboundEventImpl o) { + public ConversationSinchEventInternalImpl(InboundEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(MessageDeliveryReceiptEventImpl o) { + public ConversationSinchEventInternalImpl(MessageDeliveryReceiptEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(MessageInboundEventImpl o) { + public ConversationSinchEventInternalImpl(MessageInboundEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(MessageInboundSmartConversationRedactionEventImpl o) { + public ConversationSinchEventInternalImpl(MessageInboundSmartConversationRedactionEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(MessageSubmitEventImpl o) { + public ConversationSinchEventInternalImpl(MessageSubmitEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(OptInEventImpl o) { + public ConversationSinchEventInternalImpl(OptInEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(OptOutEventImpl o) { + public ConversationSinchEventInternalImpl(OptOutEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(RecordNotificationEventImpl o) { + public ConversationSinchEventInternalImpl(RecordNotificationEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(SmartConversationsEventImpl o) { + public ConversationSinchEventInternalImpl(SmartConversationsEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public ConversationEventInternalImpl(UnsupportedCallbackEventImpl o) { + public ConversationSinchEventInternalImpl(UnsupportedCallbackEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } @@ -1127,12 +1130,12 @@ public ConversationEventInternalImpl(UnsupportedCallbackEventImpl o) { schemas.put("SmartConversationsEventImpl", SmartConversationsEventImpl.class); schemas.put("UnsupportedCallbackEventImpl", UnsupportedCallbackEventImpl.class); JSONNavigator.registerDescendants( - ConversationEventInternalImpl.class, Collections.unmodifiableMap(schemas)); + ConversationSinchEventInternalImpl.class, Collections.unmodifiableMap(schemas)); } @Override public Map> getSchemas() { - return ConversationEventInternalImpl.schemas; + return ConversationSinchEventInternalImpl.schemas; } /** diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEvent.java index 8e691471b..f97a1400d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback delivers contact (end-user) messages to the API clients. */ @JsonDeserialize(builder = MessageInboundEventImpl.Builder.class) public interface MessageInboundEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventImpl.java index 820723e6c..96b85792e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class MessageInboundEventImpl implements MessageInboundEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventMessage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventMessage.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java index ce60575d8..dbde95e7a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventMessage.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; 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/conversation/models/v1/webhooks/events/message/MessageInboundEventMessageImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessageImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventMessageImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessageImpl.java index 2b90fb1f7..254ebd610 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventMessageImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessageImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEvent.java index 99832273b..c6710793f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -20,7 +20,7 @@ */ @JsonDeserialize(builder = MessageSubmitEventImpl.Builder.class) public interface MessageSubmitEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventImpl.java index 9cb72002b..253733dfd 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class MessageSubmitEventImpl implements MessageSubmitEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventMessage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventMessage.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventMessage.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventMessage.java index 838edaa9b..27e606206 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventMessage.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventMessage.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentity; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventMessageImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventMessageImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventMessageImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventMessageImpl.java index c858f7904..ee8959497 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventMessageImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventMessageImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEvent.java index b388bbfc2..875dc7eb4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is used to deliver opt-in notifications from the channels. */ @JsonDeserialize(builder = OptInEventImpl.Builder.class) public interface OptInEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventImpl.java index 16fa42cab..85b2f1101 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class OptInEventImpl implements OptInEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java index df4f1bd87..a481ea38e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; 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/conversation/models/v1/webhooks/events/opting/OptInEventNotificationErrorDetails.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationErrorDetails.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationErrorDetails.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationErrorDetails.java index 25a68f12e..aa8637d57 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationErrorDetails.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationErrorDetails.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationErrorDetailsImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationErrorDetailsImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationErrorDetailsImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationErrorDetailsImpl.java index 6907ca5b8..3b013a33e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationErrorDetailsImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationErrorDetailsImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationImpl.java index b4ce4aceb..1e894a79d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEvent.java index 7f023106a..e4ed121e2 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** This callback is used to deliver opt-out notifications from the channels. */ @JsonDeserialize(builder = OptOutEventImpl.Builder.class) public interface OptOutEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventImpl.java index 9e30161ac..5e83f5e3e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class OptOutEventImpl implements OptOutEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java index 99f6c52e6..79bc483b7 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; 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/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationErrorDetails.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationErrorDetails.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationErrorDetails.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationErrorDetails.java index 5d7cb74c9..39d7c561a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationErrorDetails.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationErrorDetails.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationErrorDetailsImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationErrorDetailsImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationErrorDetailsImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationErrorDetailsImpl.java index 46e17d4fa..6427f3edd 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationErrorDetailsImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationErrorDetailsImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationImpl.java index 0f5364141..aa80ac54a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEvent.java index cdaff48f7..8620bddae 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.record; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -16,7 +16,7 @@ /** RecordNotificationEvent */ @JsonDeserialize(builder = RecordNotificationEventImpl.Builder.class) public interface RecordNotificationEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventImpl.java index b27b4a704..08dd7105d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.record; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class RecordNotificationEventImpl implements RecordNotificationEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java index 2611ad6ca..77082f361 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.record; 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/conversation/models/v1/webhooks/events/record/RecordNotificationEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotificationImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotificationImpl.java index 92f063e24..a681d6c49 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.record; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/AnalysisResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/AnalysisResult.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/AnalysisResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/AnalysisResult.java index a420a8b66..49879f75c 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/AnalysisResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/AnalysisResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/AnalysisResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/AnalysisResultImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/AnalysisResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/AnalysisResultImpl.java index 11c7db56d..df5462bd5 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/AnalysisResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/AnalysisResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassification.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassification.java index eaa135ce1..26f3402f6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationData.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationData.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationData.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationData.java index 1eb2a60c7..abb4f3e1e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationData.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationData.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationDataImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationDataImpl.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationDataImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationDataImpl.java index 64197916e..9cdad158a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationDataImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationDataImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationImpl.java index 97fde9da2..5beed32b0 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentFieldClassificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentFieldClassificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentImageClassification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentImageClassification.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentImageClassification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentImageClassification.java index 9be83c897..f9dad5096 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentImageClassification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentImageClassification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentImageClassificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentImageClassificationImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentImageClassificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentImageClassificationImpl.java index 39bc660a0..16d1f9bce 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/DocumentImageClassificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/DocumentImageClassificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/IntentResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/IntentResult.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/IntentResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/IntentResult.java index af2600c2d..edd87a6bf 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/IntentResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/IntentResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/IntentResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/IntentResultImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/IntentResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/IntentResultImpl.java index 2df8a0626..dd0c671a6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/IntentResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/IntentResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningImageRecognitionResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningImageRecognitionResult.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningImageRecognitionResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningImageRecognitionResult.java index afd5f5312..68c529abf 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningImageRecognitionResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningImageRecognitionResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningImageRecognitionResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningImageRecognitionResultImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningImageRecognitionResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningImageRecognitionResultImpl.java index 2175c831c..8fa332dae 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningImageRecognitionResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningImageRecognitionResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningNLUResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningNLUResult.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningNLUResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningNLUResult.java index 77ed6d7df..f2a5635af 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningNLUResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningNLUResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningNLUResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningNLUResultImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningNLUResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningNLUResultImpl.java index 65edfaf0c..2a972bf0a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningNLUResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningNLUResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningPIIResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningPIIResult.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningPIIResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningPIIResult.java index 065ecb959..d1032ba07 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningPIIResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningPIIResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningPIIResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningPIIResultImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningPIIResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningPIIResultImpl.java index 1b8411dad..74056f76a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningPIIResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningPIIResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningSentimentResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningSentimentResult.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningSentimentResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningSentimentResult.java index a6c0559f0..de1f7e471 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningSentimentResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningSentimentResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningSentimentResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningSentimentResultImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningSentimentResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningSentimentResultImpl.java index 9f5cd5a66..73dbc2814 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MachineLearningSentimentResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MachineLearningSentimentResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEvent.java similarity index 91% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEvent.java index 786e8413f..9511c37c9 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEvent.java @@ -8,10 +8,10 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEventMessage; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventMessage; import java.time.Instant; /** @@ -20,7 +20,7 @@ */ @JsonDeserialize(builder = MessageInboundSmartConversationRedactionEventImpl.Builder.class) public interface MessageInboundSmartConversationRedactionEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventImpl.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventImpl.java index 1d8ecca77..497d057e7 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -7,7 +7,7 @@ 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.conversation.models.v1.webhooks.events.message.MessageInboundEventMessage; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventMessage; import java.time.Instant; import java.util.Objects; @@ -24,7 +24,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class MessageInboundSmartConversationRedactionEventImpl implements MessageInboundSmartConversationRedactionEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OffensiveAnalysis.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OffensiveAnalysis.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java index 1c3088398..b61eaebbf 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OffensiveAnalysis.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; 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/conversation/models/v1/webhooks/events/smartconversations/OffensiveAnalysisImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysisImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OffensiveAnalysisImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysisImpl.java index 1b8cda841..9a4163e5e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OffensiveAnalysisImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysisImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognition.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognition.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognition.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognition.java index 89e1f44df..24a720a29 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognition.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognition.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionData.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionData.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionData.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionData.java index 1e9e16f55..b0ae2aac0 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionData.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionData.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionDataImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionDataImpl.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionDataImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionDataImpl.java index 8d08ced12..0b903f9ef 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionDataImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionDataImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionImpl.java index fb9e18294..742adcba6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/OpticalCharacterRecognitionImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OpticalCharacterRecognitionImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/Sentiment.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/Sentiment.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/Sentiment.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/Sentiment.java index 7dfef2bb2..886131a1a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/Sentiment.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/Sentiment.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.sinch.sdk.core.utils.EnumDynamic; import com.sinch.sdk.core.utils.EnumSupportDynamic; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SentimentResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SentimentResult.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SentimentResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SentimentResult.java index 23c15a6f2..35c76903e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SentimentResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SentimentResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SentimentResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SentimentResultImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SentimentResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SentimentResultImpl.java index 52e84f20f..47e5d03f4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SentimentResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SentimentResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEvent.java index 292aadb4b..125d6ce00 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -19,7 +19,7 @@ */ @JsonDeserialize(builder = SmartConversationsEventImpl.Builder.class) public interface SmartConversationsEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventImpl.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventImpl.java index f05ad94cc..ec99877e5 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class SmartConversationsEventImpl implements SmartConversationsEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventNotification.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventNotification.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventNotification.java index e5f5cd861..370a3e80d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventNotification.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventNotification.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventNotificationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventNotificationImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventNotificationImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventNotificationImpl.java index 41bd12982..3c7978e0f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventNotificationImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventNotificationImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEvent.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEvent.java index edf7ba2da..46842484f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.time.Instant; @@ -19,7 +19,7 @@ */ @JsonDeserialize(builder = UnsupportedCallbackEventImpl.Builder.class) public interface UnsupportedCallbackEvent - extends com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + extends com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { /** * Id of the subscribed app. diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventCallback.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventCallback.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventCallback.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventCallback.java index c3c60fb9e..1a418c8d3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventCallback.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventCallback.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentity; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventCallbackImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventCallbackImpl.java similarity index 99% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventCallbackImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventCallbackImpl.java index 4d8cc8d57..17f349a90 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventCallbackImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventCallbackImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventImpl.java index 988ab0a8f..e47443195 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,7 +23,7 @@ @JsonInclude(value = JsonInclude.Include.CUSTOM) public class UnsupportedCallbackEventImpl implements UnsupportedCallbackEvent, - com.sinch.sdk.domains.conversation.models.v1.webhooks.events.ConversationWebhookEvent { + com.sinch.sdk.domains.conversation.models.v1.sinchevents.ConversationSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_APP_ID = "app_id"; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookTargetType.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookTargetType.java deleted file mode 100644 index 0309347e9..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookTargetType.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; - -import com.sinch.sdk.core.utils.EnumDynamic; -import com.sinch.sdk.core.utils.EnumSupportDynamic; -import java.util.Arrays; -import java.util.stream.Stream; - -/** Gets or Sets WebhookTargetType */ -public class WebhookTargetType extends EnumDynamic { - - /** Events won't be sent. */ - public static final WebhookTargetType DISMISS = new WebhookTargetType("DISMISS"); - - /** Events will be sent to an HTTP target. */ - public static final WebhookTargetType HTTP = new WebhookTargetType("HTTP"); - - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - WebhookTargetType.class, WebhookTargetType::new, Arrays.asList(DISMISS, HTTP)); - - private WebhookTargetType(String value) { - super(value); - } - - public static Stream values() { - return ENUM_SUPPORT.values(); - } - - public static WebhookTargetType from(String value) { - return ENUM_SUPPORT.from(value); - } - - public static String valueOf(WebhookTargetType e) { - return ENUM_SUPPORT.valueOf(e); - } -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookTrigger.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookTrigger.java deleted file mode 100644 index 934cf39a9..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookTrigger.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; - -import com.sinch.sdk.core.utils.EnumDynamic; -import com.sinch.sdk.core.utils.EnumSupportDynamic; -import java.util.Arrays; -import java.util.stream.Stream; - -/** Each webhook can subscribe to one or more of the following triggers */ -public class WebhookTrigger extends EnumDynamic { - - /** Using this value will cause errors. */ - public static final WebhookTrigger UNSPECIFIED_TRIGGER = - new WebhookTrigger("UNSPECIFIED_TRIGGER"); - - /** Subscribe to delivery receipts for a message sent. */ - public static final WebhookTrigger MESSAGE_DELIVERY = new WebhookTrigger("MESSAGE_DELIVERY"); - - /** Subscribe to delivery receipts for a event sent. */ - public static final WebhookTrigger EVENT_DELIVERY = new WebhookTrigger("EVENT_DELIVERY"); - - /** Subscribe to inbound messages from end users on the underlying channels. */ - public static final WebhookTrigger MESSAGE_INBOUND = new WebhookTrigger("MESSAGE_INBOUND"); - - /** Subscribe to inbound events from end users on the underlying channels. */ - public static final WebhookTrigger EVENT_INBOUND = new WebhookTrigger("EVENT_INBOUND"); - - /** Subscribe to an event that is triggered when a new conversation has been started. */ - public static final WebhookTrigger CONVERSATION_START = new WebhookTrigger("CONVERSATION_START"); - - /** Subscribe to an event that is triggered when a active conversation has been stopped. */ - public static final WebhookTrigger CONVERSATION_STOP = new WebhookTrigger("CONVERSATION_STOP"); - - /** Subscribe to an event that is triggered when a new contact has been created. */ - public static final WebhookTrigger CONTACT_CREATE = new WebhookTrigger("CONTACT_CREATE"); - - /** Subscribe to an event that is triggered when a contact has been deleted. */ - public static final WebhookTrigger CONTACT_DELETE = new WebhookTrigger("CONTACT_DELETE"); - - /** Subscribe to an event that is triggered when a two contacts are merged. */ - public static final WebhookTrigger CONTACT_MERGE = new WebhookTrigger("CONTACT_MERGE"); - - /** Subscribe to an event that is triggered when a contact is updated. */ - public static final WebhookTrigger CONTACT_UPDATE = new WebhookTrigger("CONTACT_UPDATE"); - - /** Subscribe to callbacks that are not natively supported by the Conversation API. */ - public static final WebhookTrigger UNSUPPORTED = new WebhookTrigger("UNSUPPORTED"); - - /** Subscribe to opt_ins. */ - public static final WebhookTrigger OPT_IN = new WebhookTrigger("OPT_IN"); - - /** Subscribe to opt_outs. */ - public static final WebhookTrigger OPT_OUT = new WebhookTrigger("OPT_OUT"); - - /** Subscribe to see get capability results. */ - public static final WebhookTrigger CAPABILITY = new WebhookTrigger("CAPABILITY"); - - /** Subscribe to get an event when a conversation is deleted. */ - public static final WebhookTrigger CONVERSATION_DELETE = - new WebhookTrigger("CONVERSATION_DELETE"); - - /** - * Subscribe to get an event when contact identity duplications are found during message or event - * processing. - */ - public static final WebhookTrigger CONTACT_IDENTITIES_DUPLICATION = - new WebhookTrigger("CONTACT_IDENTITIES_DUPLICATION"); - - /** Subscribe to direct channel event. */ - public static final WebhookTrigger CHANNEL_EVENT = new WebhookTrigger("CHANNEL_EVENT"); - - /** - * Subscribe to Smart conversation - * analysis. - */ - public static final WebhookTrigger SMART_CONVERSATION = new WebhookTrigger("SMART_CONVERSATION"); - - /** - * Subscribe to analysis for - * messages from end-users. - */ - public static final WebhookTrigger MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION = - new WebhookTrigger("MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION"); - - /** Subscribe to Record Notifications. */ - public static final WebhookTrigger RECORD_NOTIFICATION = - new WebhookTrigger("RECORD_NOTIFICATION"); - - /** Subscribe to message submit Notifications. */ - public static final WebhookTrigger MESSAGE_SUBMIT = new WebhookTrigger("MESSAGE_SUBMIT"); - - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - WebhookTrigger.class, - WebhookTrigger::new, - Arrays.asList( - UNSPECIFIED_TRIGGER, - MESSAGE_DELIVERY, - EVENT_DELIVERY, - MESSAGE_INBOUND, - EVENT_INBOUND, - CONVERSATION_START, - CONVERSATION_STOP, - CONTACT_CREATE, - CONTACT_DELETE, - CONTACT_MERGE, - CONTACT_UPDATE, - UNSUPPORTED, - OPT_IN, - OPT_OUT, - CAPABILITY, - CONVERSATION_DELETE, - CONTACT_IDENTITIES_DUPLICATION, - CHANNEL_EVENT, - SMART_CONVERSATION, - MESSAGE_INBOUND_SMART_CONVERSATION_REDACTION, - RECORD_NOTIFICATION, - MESSAGE_SUBMIT)); - - private WebhookTrigger(String value) { - super(value); - } - - public static Stream values() { - return ENUM_SUPPORT.values(); - } - - public static WebhookTrigger from(String value) { - return ENUM_SUPPORT.from(value); - } - - public static String valueOf(WebhookTrigger e) { - return ENUM_SUPPORT.valueOf(e); - } -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/internal/WebhooksListResponseInternalImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/internal/WebhooksListResponseInternalImpl.java deleted file mode 100644 index 817241e4e..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/webhooks/internal/WebhooksListResponseInternalImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.internal; - -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.conversation.models.v1.webhooks.Webhook; -import java.util.List; -import java.util.Objects; - -@JsonPropertyOrder({WebhooksListResponseInternalImpl.JSON_PROPERTY_WEBHOOKS}) -@JsonFilter("uninitializedFilter") -@JsonInclude(value = JsonInclude.Include.CUSTOM) -public class WebhooksListResponseInternalImpl implements WebhooksListResponseInternal { - private static final long serialVersionUID = 1L; - - public static final String JSON_PROPERTY_WEBHOOKS = "webhooks"; - - private OptionalValue> webhooks; - - public WebhooksListResponseInternalImpl() {} - - protected WebhooksListResponseInternalImpl(OptionalValue> webhooks) { - this.webhooks = webhooks; - } - - @JsonIgnore - public List getWebhooks() { - return webhooks.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_WEBHOOKS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue> webhooks() { - return webhooks; - } - - /** Return true if this ListWebhooksResponse object is equal to o. */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - WebhooksListResponseInternalImpl listWebhooksResponse = (WebhooksListResponseInternalImpl) o; - return Objects.equals(this.webhooks, listWebhooksResponse.webhooks); - } - - @Override - public int hashCode() { - return Objects.hash(webhooks); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class WebhooksListResponseInternalImpl {\n"); - sb.append(" webhooks: ").append(toIndentedString(webhooks)).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 WebhooksListResponseInternal.Builder { - OptionalValue> webhooks = OptionalValue.empty(); - - @JsonProperty(JSON_PROPERTY_WEBHOOKS) - public Builder setWebhooks(List webhooks) { - this.webhooks = OptionalValue.of(webhooks); - return this; - } - - public WebhooksListResponseInternal build() { - return new WebhooksListResponseInternalImpl(webhooks); - } - } -} diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/apps/AppDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/apps/AppDtoTest.java index f224a9f07..2d613840f 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/apps/AppDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/apps/AppDtoTest.java @@ -73,8 +73,8 @@ public class AppDtoTest extends BaseTest { .build()) .setSmartConversation(SmartConversation.builder().setEnabled(true).build()) .setQueueStats(QueueStats.builder().setOutboundLimit(500000L).setOutboundSize(0L).build()) - .setCallbackSettings( - CallbackSettings.builder().setSecretForOverriddenCallbackUrls("my secret").build()) + .setEventDestinationSettings( + EventDestinationSettings.builder().setSecretForOverriddenTarget("my secret").build()) .setDeliveryReportBasedFallback( DeliveryReportBasedFallback.builder() .setEnabled(true) @@ -118,8 +118,8 @@ public class AppDtoTest extends BaseTest { .setTtlDays(0L) .build()) .setSmartConversation(SmartConversation.builder().setEnabled(true).build()) - .setCallbackSettings( - CallbackSettings.builder().setSecretForOverriddenCallbackUrls("my secret").build()) + .setEventDestinationSettings( + EventDestinationSettings.builder().setSecretForOverriddenTarget("my secret").build()) .build(); public static AppUpdateRequest appUpdateRequestDto = AppUpdateRequest.builder() @@ -153,8 +153,8 @@ public class AppDtoTest extends BaseTest { .setTtlDays(0L) .build()) .setSmartConversation(SmartConversation.builder().setEnabled(true).build()) - .setCallbackSettings( - CallbackSettings.builder().setSecretForOverriddenCallbackUrls("my secret").build()) + .setEventDestinationSettings( + EventDestinationSettings.builder().setSecretForOverriddenTarget("my secret").build()) .build(); @Test diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentialsDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentialsDtoTest.java similarity index 77% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentialsDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentialsDtoTest.java index 3a15d731b..11768c14f 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/ClientCredentialsDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentialsDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.ClientCredentials.TokenRequestTypeEnum; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.ClientCredentials.TokenRequestTypeEnum; import org.json.JSONException; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -24,10 +24,10 @@ public class ClientCredentialsDtoTest extends ConversationBaseTest { .setTokenRequestType(TokenRequestTypeEnum.BASIC) .build(); - @GivenJsonResource("domains/conversation/v1/webhooks/ClientCredentialsDto.json") + @GivenJsonResource("domains/conversation/v1/eventdestinations/ClientCredentialsDto.json") ClientCredentials dto; - @GivenTextResource("/domains/conversation/v1/webhooks/ClientCredentialsDto.json") + @GivenTextResource("/domains/conversation/v1/eventdestinations/ClientCredentialsDto.json") String json; @Test diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationDtoTest.java similarity index 52% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationDtoTest.java index 1d8aba96d..977266352 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/WebhookDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/EventDestinationDtoTest.java @@ -1,54 +1,56 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks; +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.fasterxml.jackson.core.JsonProcessingException; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.request.CreateWebhookRequest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.request.EventDestinationCreateRequest; import java.util.Arrays; import org.json.JSONException; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; @TestWithResources -public class WebhookDtoTest extends ConversationBaseTest { +public class EventDestinationDtoTest extends ConversationBaseTest { - public static CreateWebhookRequest expectedRequestDto = - CreateWebhookRequest.builder() + public static EventDestinationCreateRequest expectedRequestDto = + EventDestinationCreateRequest.builder() .setAppId("an app id") .setTarget("https://fake.url/ConversationEvent") - .setTargetType(WebhookTargetType.HTTP) + .setTargetType(EventDestinationTargetType.HTTP) .setSecret("my secret value") .setTriggers( Arrays.asList( - WebhookTrigger.CAPABILITY, - WebhookTrigger.CHANNEL_EVENT, - WebhookTrigger.CONTACT_CREATE, - WebhookTrigger.UNSUPPORTED)) + EventDestinationTrigger.CAPABILITY, + EventDestinationTrigger.CHANNEL_EVENT, + EventDestinationTrigger.CONTACT_CREATE, + EventDestinationTrigger.UNSUPPORTED)) .setClientCredentials(ClientCredentialsDtoTest.expectedDto) .build(); - public static Webhook expectedResponseDto = - Webhook.builder() + public static EventDestination expectedResponseDto = + EventDestination.builder() .setId("a webhook id") .setAppId("an app id") .setTarget("https://fake.url/ConversationEvent") - .setTargetType(WebhookTargetType.HTTP) + .setTargetType(EventDestinationTargetType.HTTP) .setSecret("my secret value") .setTriggers( Arrays.asList( - WebhookTrigger.CAPABILITY, - WebhookTrigger.CHANNEL_EVENT, - WebhookTrigger.CONTACT_CREATE, - WebhookTrigger.UNSUPPORTED)) + EventDestinationTrigger.CAPABILITY, + EventDestinationTrigger.CHANNEL_EVENT, + EventDestinationTrigger.CONTACT_CREATE, + EventDestinationTrigger.UNSUPPORTED)) .setClientCredentials(ClientCredentialsDtoTest.expectedDto) .build(); - @GivenTextResource("domains/conversation/v1/webhooks/WebhookRequestDto.json") + @GivenTextResource( + "domains/conversation/v1/eventdestinations/request/EventDestinationRequestDto.json") String requestJSON; - @GivenTextResource("/domains/conversation/v1/webhooks/WebhookResponseDto.json") + @GivenTextResource( + "/domains/conversation/v1/eventdestinations/response/EventDestinationResponseDto.json") String responseJSON; @Test @@ -61,7 +63,7 @@ void serialize() throws JsonProcessingException, JSONException { @Test void deserialize() throws JsonProcessingException { - Object deserialized = objectMapper.readValue(responseJSON, Webhook.class); + Object deserialized = objectMapper.readValue(responseJSON, EventDestination.class); TestHelpers.recursiveEquals(deserialized, expectedResponseDto); } } diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponseDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponseDtoTest.java new file mode 100644 index 000000000..3533cdccc --- /dev/null +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/response/EventDestinationsListResponseDtoTest.java @@ -0,0 +1,28 @@ +package com.sinch.sdk.domains.conversation.models.v1.eventdestinations.response; + +import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; +import com.adelean.inject.resources.junit.jupiter.TestWithResources; +import com.sinch.sdk.core.TestHelpers; +import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.EventDestinationDtoTest; +import com.sinch.sdk.domains.conversation.models.v1.eventdestinations.internal.EventDestinationsListResponseInternal; +import java.util.Arrays; +import org.junit.jupiter.api.Test; + +@TestWithResources +public class EventDestinationsListResponseDtoTest extends ConversationBaseTest { + + @GivenJsonResource( + "domains/conversation/v1/eventdestinations/response/EventDestinationsListResponseDto.json") + EventDestinationsListResponseInternal dto; + + public static EventDestinationsListResponseInternal expectedResponseDto = + EventDestinationsListResponseInternal.builder() + .setEventDestinations(Arrays.asList(EventDestinationDtoTest.expectedResponseDto)) + .build(); + + @Test + void deserialize() { + TestHelpers.recursiveEquals(dto, expectedResponseDto); + } +} diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestDtoTest.java index 9c4cc2c53..51b96eb86 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/events/request/SendEventRequestDtoTest.java @@ -27,7 +27,7 @@ public class SendEventRequestDtoTest extends ConversationBaseTest { .setChannel(ConversationChannel.RCS) .setIdentity("+123456789") .build())) - .setCallbackUrl("foo URL") + .setEventDestinationTarget("foo URL") .setChannelPriorityOrder(Arrays.asList(ConversationChannel.RCS)) .setEventMetadata("event metadata value") .setQueue(MessageQueue.NORMAL_PRIORITY) diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageDtoTest.java index 0d3e1b60e..04002e316 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/messages/request/SendMessageDtoTest.java @@ -99,7 +99,7 @@ private static SendMessageRequest.Builder builder( return SendMessageRequest.builder() .setAppId("my app ID") .setRecipient(ContactId.builder().setContactId("my contact ID").build()) - .setCallbackUrl("callback URL value") + .setEventDestinationTarget("callback URL value") .setChannelPriorityOrder(Collections.singletonList(ConversationChannel.LINE)) .setChannelProperties(map) .setMessageMetadata("message metadata value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventDtoTest.java similarity index 72% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventDtoTest.java index cb599937a..fd797778e 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/capability/CapabilityEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; @@ -6,9 +6,9 @@ import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; import com.sinch.sdk.domains.conversation.models.v1.ReasonDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.capability.CapabilityEventNotification.CapabilityStatusEnum; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.capability.CapabilityEventNotification.CapabilityStatusEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import java.util.Arrays; import org.junit.jupiter.api.Test; @@ -16,11 +16,11 @@ @TestWithResources public class CapabilityEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/capability/CapabilityEventDto.json") - ConversationEventInternal eventDto; + @GivenJsonResource("domains/conversation/v1/sinchevents/capability/CapabilityEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (CapabilityEventImpl) CapabilityEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventDtoTest.java similarity index 73% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventDtoTest.java index 63b585cee..73c784c03 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/channel/ChannelEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/channel/ChannelEventDtoTest.java @@ -1,12 +1,12 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.channel; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.channel; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import java.util.Collections; import org.junit.jupiter.api.Test; @@ -14,11 +14,11 @@ @TestWithResources public class ChannelEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/channel/ChannelEventDto.json") - ConversationEventInternal eventDto; + @GivenJsonResource("domains/conversation/v1/sinchevents/channel/ChannelEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ChannelEventImpl) ChannelEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEventDtoTest.java similarity index 70% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEventDtoTest.java index 2a8309234..00b95542f 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactCreateEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactCreateEventDtoTest.java @@ -1,23 +1,23 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.contacts.ContactDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @TestWithResources public class ContactCreateEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/contact/ContactCreateEventDto.json") - ConversationEventInternal eventDto; + @GivenJsonResource("domains/conversation/v1/sinchevents/contact/ContactCreateEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ContactCreateEventImpl) ContactCreateEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEventDtoTest.java similarity index 70% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEventDtoTest.java index b538aa3ea..5b7d9fe45 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactDeleteEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactDeleteEventDtoTest.java @@ -1,23 +1,23 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.contacts.ContactDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @TestWithResources public class ContactDeleteEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/contact/ContactDeleteEventDto.json") - ConversationEventInternal eventDto; + @GivenJsonResource("domains/conversation/v1/sinchevents/contact/ContactDeleteEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ContactDeleteEventImpl) ContactDeleteEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDtoTest.java similarity index 74% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDtoTest.java index 97d21243d..e221f3e71 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDtoTest.java @@ -1,12 +1,12 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import java.util.Arrays; import org.junit.jupiter.api.Test; @@ -15,11 +15,11 @@ public class ContactIdentitiesDuplicationEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDto.json") - ConversationEventInternal eventDto; + "domains/conversation/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ContactIdentitiesDuplicationEventImpl) ContactIdentitiesDuplicationEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventDtoTest.java similarity index 71% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventDtoTest.java index 56803b709..318d46466 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactMergeEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactMergeEventDtoTest.java @@ -1,23 +1,23 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.contacts.ContactDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @TestWithResources public class ContactMergeEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/contact/ContactMergeEventDto.json") - ConversationEventInternal eventDto; + @GivenJsonResource("domains/conversation/v1/sinchevents/contact/ContactMergeEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ContactMergeEventImpl) ContactMergeEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEventDtoTest.java similarity index 70% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEventDtoTest.java index 4b7525b19..175111e8c 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/contact/ContactUpdateEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/contact/ContactUpdateEventDtoTest.java @@ -1,23 +1,23 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.contact; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.contact; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.contacts.ContactDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @TestWithResources public class ContactUpdateEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/contact/ContactUpdateEventDto.json") - ConversationEventInternal eventDto; + @GivenJsonResource("domains/conversation/v1/sinchevents/contact/ContactUpdateEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ContactUpdateEventImpl) ContactUpdateEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEventDtoTest.java similarity index 71% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEventDtoTest.java index b4a9f912a..6968d3000 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationDeleteEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationDeleteEventDtoTest.java @@ -1,12 +1,12 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.conversations.ConversationDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @@ -14,11 +14,11 @@ public class ConversationDeleteEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/conversation/ConversationDeleteEventDto.json") - ConversationEventInternal eventDto; + "domains/conversation/v1/sinchevents/conversation/ConversationDeleteEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ConversationDeleteEventImpl) ConversationDeleteEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEventDtoTest.java similarity index 71% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEventDtoTest.java index 020610da4..09b21e738 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStartEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStartEventDtoTest.java @@ -1,12 +1,12 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.conversations.ConversationDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @@ -14,11 +14,11 @@ public class ConversationStartEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/conversation/ConversationStartEventDto.json") - ConversationEventInternal eventDto; + "domains/conversation/v1/sinchevents/conversation/ConversationStartEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ConversationStartEventImpl) ConversationStartEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEventDtoTest.java similarity index 71% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEventDtoTest.java index b0d810894..fd8df295f 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/conversation/ConversationStopEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/conversation/ConversationStopEventDtoTest.java @@ -1,12 +1,12 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.conversation; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.conversation; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.conversations.ConversationDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @@ -14,11 +14,11 @@ public class ConversationStopEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/conversation/ConversationStopEventDto.json") - ConversationEventInternal eventDto; + "domains/conversation/v1/sinchevents/conversation/ConversationStopEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (ConversationStopEventImpl) ConversationStopEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEventDtoTest.java similarity index 77% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEventDtoTest.java index 95a6fe305..bb1747311 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/EventDeliveryReceiptEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/EventDeliveryReceiptEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; @@ -7,8 +7,8 @@ import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentityDtoTest; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.ReasonDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @@ -16,11 +16,11 @@ public class EventDeliveryReceiptEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/delivery/EventDeliveryReceiptEventDto.json") - ConversationEventInternal eventDto; + "domains/conversation/v1/sinchevents/delivery/EventDeliveryReceiptEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (EventDeliveryReceiptEventImpl) EventDeliveryReceiptEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEventDtoTest.java similarity index 77% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEventDtoTest.java index 870197ca9..caa39b81e 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/delivery/MessageDeliveryReceiptEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.delivery; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.delivery; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; @@ -7,8 +7,8 @@ import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentityDtoTest; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.ReasonDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternal; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.internal.ConversationEventInternalImpl; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternal; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.internal.ConversationSinchEventInternalImpl; import java.time.Instant; import org.junit.jupiter.api.Test; @@ -16,11 +16,11 @@ public class MessageDeliveryReceiptEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDto.json") - ConversationEventInternal eventDto; + "domains/conversation/v1/sinchevents/delivery/MessageDeliveryReceiptEventDto.json") + ConversationSinchEventInternal eventDto; - public static ConversationEventInternal expectedEventDto = - new ConversationEventInternalImpl( + public static ConversationSinchEventInternal expectedEventDto = + new ConversationSinchEventInternalImpl( (MessageDeliveryReceiptEventImpl) MessageDeliveryReceiptEvent.builder() .setAppId("app id value") diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEventDtoTest.java similarity index 87% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEventDtoTest.java index 8d95df9ef..186730700 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/inbound/InboundEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/InboundEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -10,7 +10,7 @@ import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.events.types.ComposingEventDtoTest; import com.sinch.sdk.domains.conversation.models.v1.events.types.ReactionEventDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.inbound.Event.DirectionEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.inbound.Event.DirectionEnum; import java.time.Instant; import org.json.JSONException; import org.junit.jupiter.api.Test; @@ -19,18 +19,18 @@ @TestWithResources public class InboundEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/inbound/InboundContactEventDto.json") + @GivenJsonResource("domains/conversation/v1/sinchevents/inbound/InboundContactEventDto.json") InboundEvent inboundContactEventDto; - @GivenTextResource("domains/conversation/v1/webhooks/events/inbound/InboundContactEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/inbound/InboundContactEventDto.json") String jsonInboundContactEventDto; @GivenJsonResource( - "domains/conversation/v1/webhooks/events/inbound/InboundContactMessageEventDto.json") + "domains/conversation/v1/sinchevents/inbound/InboundContactMessageEventDto.json") InboundEvent inboundContactMessageEventDto; @GivenTextResource( - "domains/conversation/v1/webhooks/events/inbound/InboundContactMessageEventDto.json") + "domains/conversation/v1/sinchevents/inbound/InboundContactMessageEventDto.json") String jsonInboundContactMessageEventDto; public static InboundEvent expectedInboundContactEventDto = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventDtoTest.java similarity index 86% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventDtoTest.java index bcd2c870a..898fa8da6 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageInboundEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -9,7 +9,7 @@ import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentityDtoTest; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.messages.ContactMessageDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEventMessage.DirectionEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventMessage.DirectionEnum; import java.time.Instant; import org.json.JSONException; import org.junit.jupiter.api.Test; @@ -18,10 +18,10 @@ @TestWithResources public class MessageInboundEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/message/MessageInboundEventDto.json") + @GivenJsonResource("domains/conversation/v1/sinchevents/message/MessageInboundEventDto.json") MessageInboundEvent messageInboundEventDto; - @GivenTextResource("domains/conversation/v1/webhooks/events/message/MessageInboundEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/message/MessageInboundEventDto.json") String jsonMessageInboundEventDto; public static MessageInboundEvent expectedMessageInboundEvent = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventDtoTest.java similarity index 89% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventDtoTest.java index 40c1f004e..37871e2e4 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/message/MessageSubmitEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageSubmitEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.message; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -17,10 +17,10 @@ @TestWithResources public class MessageSubmitEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/message/MessageSubmitEventDto.json") + @GivenJsonResource("domains/conversation/v1/sinchevents/message/MessageSubmitEventDto.json") MessageSubmitEvent messageSubmitEventDto; - @GivenTextResource("domains/conversation/v1/webhooks/events/message/MessageSubmitEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/message/MessageSubmitEventDto.json") String jsonMessageSubmitEventDto; public static MessageSubmitEvent expectedMessageInboundEvent = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventDtoTest.java similarity index 85% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventDtoTest.java index 6f8bea49f..cab9a60c7 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptInEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -8,7 +8,7 @@ import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptInEventNotification.StatusEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptInEventNotification.StatusEnum; import java.time.Instant; import org.json.JSONException; import org.junit.jupiter.api.Test; @@ -17,10 +17,10 @@ @TestWithResources public class OptInEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/opting/OptInEventDto.json") + @GivenJsonResource("domains/conversation/v1/sinchevents/opting/OptInEventDto.json") OptInEvent messageOptInEventDto; - @GivenTextResource("domains/conversation/v1/webhooks/events/opting/OptInEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/opting/OptInEventDto.json") String jsonOptInEventDto; public static OptInEvent expectedOptInEvent = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventDtoTest.java similarity index 85% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventDtoTest.java index c9ee16263..aceb49d99 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/opting/OptOutEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -8,7 +8,7 @@ import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.opting.OptOutEventNotification.StatusEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.opting.OptOutEventNotification.StatusEnum; import java.time.Instant; import org.json.JSONException; import org.junit.jupiter.api.Test; @@ -17,10 +17,10 @@ @TestWithResources public class OptOutEventDtoTest extends ConversationBaseTest { - @GivenJsonResource("domains/conversation/v1/webhooks/events/opting/OptOutEventDto.json") + @GivenJsonResource("domains/conversation/v1/sinchevents/opting/OptOutEventDto.json") OptOutEvent messageOptOutEventDto; - @GivenTextResource("domains/conversation/v1/webhooks/events/opting/OptOutEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/opting/OptOutEventDto.json") String jsonOptOutEventDto; public static OptOutEvent expectedOptInEvent = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventDtoTest.java similarity index 84% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventDtoTest.java index 9b6850b35..a6320b2d1 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/record/RecordNotificationEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.record; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -9,7 +9,7 @@ import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentityDtoTest; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.ReasonDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.record.RecordNotificationEventNotification.RecordStatusEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.record.RecordNotificationEventNotification.RecordStatusEnum; import java.time.Instant; import org.json.JSONException; import org.junit.jupiter.api.Test; @@ -18,12 +18,10 @@ @TestWithResources public class RecordNotificationEventDtoTest extends ConversationBaseTest { - @GivenJsonResource( - "domains/conversation/v1/webhooks/events/record/RecordNotificationEventDto.json") + @GivenJsonResource("domains/conversation/v1/sinchevents/record/RecordNotificationEventDto.json") RecordNotificationEvent recordNotificationEventDto; - @GivenTextResource( - "domains/conversation/v1/webhooks/events/record/RecordNotificationEventDto.json") + @GivenTextResource("domains/conversation/v1/sinchevents/record/RecordNotificationEventDto.json") String jsonRecordNotificationEventDto; public static RecordNotificationEvent expectedOptInEvent = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDtoTest.java similarity index 83% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDtoTest.java index b85e090a7..08b7cf61c 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -9,8 +9,8 @@ import com.sinch.sdk.domains.conversation.models.v1.ChannelIdentityDtoTest; import com.sinch.sdk.domains.conversation.models.v1.ProcessingMode; import com.sinch.sdk.domains.conversation.models.v1.messages.ContactMessageDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEventMessage; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.message.MessageInboundEventMessage.DirectionEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventMessage; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.message.MessageInboundEventMessage.DirectionEnum; import java.time.Instant; import org.json.JSONException; import org.junit.jupiter.api.Test; @@ -46,11 +46,11 @@ public class MessageInboundSmartConversationRedactionEventDtoTest extends Conver .build(); @GivenJsonResource( - "domains/conversation/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDto.json") + "domains/conversation/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDto.json") MessageInboundSmartConversationRedactionEvent messageInboundSmartConversationRedactionEventDto; @GivenTextResource( - "domains/conversation/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDto.json") + "domains/conversation/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDto.json") String jsonMessageInboundSmartConversationRedactionEventDto; @Test diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventDtoTest.java similarity index 93% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventDtoTest.java index 4328875c8..c570fd3d8 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/smartconversations/SmartConversationsEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/SmartConversationsEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -7,7 +7,7 @@ import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; import com.sinch.sdk.domains.conversation.models.v1.ConversationChannel; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.events.smartconversations.OffensiveAnalysis.EvaluationEnum; +import com.sinch.sdk.domains.conversation.models.v1.sinchevents.smartconversations.OffensiveAnalysis.EvaluationEnum; import java.time.Instant; import java.util.Arrays; import java.util.List; @@ -135,11 +135,11 @@ public class SmartConversationsEventDtoTest extends ConversationBaseTest { .build(); @GivenJsonResource( - "domains/conversation/v1/webhooks/events/smartconversations/SmartConversationsEventDto.json") + "domains/conversation/v1/sinchevents/smartconversations/SmartConversationsEventDto.json") SmartConversationsEvent smartConversationsEventDto; @GivenTextResource( - "domains/conversation/v1/webhooks/events/smartconversations/SmartConversationsEventDto.json") + "domains/conversation/v1/sinchevents/smartconversations/SmartConversationsEventDto.json") String jsonSmartConversationsEventDto; @Test diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventDtoTest.java similarity index 89% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventDtoTest.java index 362384e15..4cb0cbcf8 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/events/unsupported/UnsupportedCallbackEventDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/sinchevents/unsupported/UnsupportedCallbackEventDtoTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.events.unsupported; +package com.sinch.sdk.domains.conversation.models.v1.sinchevents.unsupported; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.GivenTextResource; @@ -18,11 +18,11 @@ public class UnsupportedCallbackEventDtoTest extends ConversationBaseTest { @GivenJsonResource( - "domains/conversation/v1/webhooks/events/unsupported/UnsupportedCallbackEventDto.json") + "domains/conversation/v1/sinchevents/unsupported/UnsupportedCallbackEventDto.json") UnsupportedCallbackEvent unsupportedCallbackEventDto; @GivenTextResource( - "domains/conversation/v1/webhooks/events/unsupported/UnsupportedCallbackEventDto.json") + "domains/conversation/v1/sinchevents/unsupported/UnsupportedCallbackEventDto.json") String jsonUnsupportedCallbackEventDto; public static UnsupportedCallbackEvent expectedUnsupportedCallbackEvent = diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/ListWebhookResponseDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/ListWebhookResponseDtoTest.java deleted file mode 100644 index 623043549..000000000 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/models/v1/webhooks/response/ListWebhookResponseDtoTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.sinch.sdk.domains.conversation.models.v1.webhooks.response; - -import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; -import com.adelean.inject.resources.junit.jupiter.TestWithResources; -import com.sinch.sdk.core.TestHelpers; -import com.sinch.sdk.domains.conversation.api.v1.adapters.ConversationBaseTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.WebhookDtoTest; -import com.sinch.sdk.domains.conversation.models.v1.webhooks.internal.WebhooksListResponseInternal; -import java.util.Arrays; -import org.junit.jupiter.api.Test; - -@TestWithResources -public class ListWebhookResponseDtoTest extends ConversationBaseTest { - - @GivenJsonResource("domains/conversation/v1/webhooks/response/ListWebhooksResponseDto.json") - WebhooksListResponseInternal dto; - - public static WebhooksListResponseInternal expectedResponseDto = - WebhooksListResponseInternal.builder() - .setWebhooks(Arrays.asList(WebhookDtoTest.expectedResponseDto)) - .build(); - - @Test - void deserialize() { - TestHelpers.recursiveEquals(dto, expectedResponseDto); - } -} diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/ClientCredentialsDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/ClientCredentialsDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/ClientCredentialsDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/ClientCredentialsDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/WebhookRequestDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/request/EventDestinationRequestDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/WebhookRequestDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/request/EventDestinationRequestDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/WebhookResponseDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/response/EventDestinationResponseDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/WebhookResponseDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/response/EventDestinationResponseDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/response/ListWebhooksResponseDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/response/EventDestinationsListResponseDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/response/ListWebhooksResponseDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/eventdestinations/response/EventDestinationsListResponseDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/capability/CapabilityEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/capability/CapabilityEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/capability/CapabilityEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/capability/CapabilityEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/channel/ChannelEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/channel/ChannelEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/channel/ChannelEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/channel/ChannelEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactCreateEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactCreateEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactCreateEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactCreateEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactDeleteEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactDeleteEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactDeleteEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactDeleteEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactIdentitiesDuplicationEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactIdentitiesDuplicationEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactMergeEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactMergeEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactMergeEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactMergeEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactUpdateEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactUpdateEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/contact/ContactUpdateEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/contact/ContactUpdateEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/conversation/ConversationDeleteEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/conversation/ConversationDeleteEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/conversation/ConversationDeleteEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/conversation/ConversationDeleteEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/conversation/ConversationStartEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/conversation/ConversationStartEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/conversation/ConversationStartEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/conversation/ConversationStartEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/conversation/ConversationStopEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/conversation/ConversationStopEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/conversation/ConversationStopEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/conversation/ConversationStopEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/delivery/EventDeliveryReceiptEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/delivery/EventDeliveryReceiptEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/delivery/EventDeliveryReceiptEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/delivery/EventDeliveryReceiptEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/delivery/MessageDeliveryReceiptEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/delivery/MessageDeliveryReceiptEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/delivery/MessageDeliveryReceiptEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/inbound/InboundContactEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/inbound/InboundContactEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/inbound/InboundContactEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/inbound/InboundContactEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/inbound/InboundContactMessageEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/inbound/InboundContactMessageEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/inbound/InboundContactMessageEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/inbound/InboundContactMessageEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/message/MessageInboundEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/message/MessageInboundEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/message/MessageInboundEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/message/MessageInboundEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/message/MessageSubmitEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/message/MessageSubmitEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/message/MessageSubmitEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/message/MessageSubmitEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/opting/OptInEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/opting/OptInEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/opting/OptInEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/opting/OptInEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/opting/OptOutEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/opting/OptOutEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/opting/OptOutEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/opting/OptOutEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/record/RecordNotificationEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/record/RecordNotificationEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/record/RecordNotificationEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/record/RecordNotificationEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/smartconversations/MessageInboundSmartConversationRedactionEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/smartconversations/MessageInboundSmartConversationRedactionEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/smartconversations/SmartConversationsEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/smartconversations/SmartConversationsEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/smartconversations/SmartConversationsEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/smartconversations/SmartConversationsEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/unsupported/UnsupportedCallbackEventDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/unsupported/UnsupportedCallbackEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/events/unsupported/UnsupportedCallbackEventDto.json rename to openapi-contracts/src/test/resources/domains/conversation/v1/sinchevents/unsupported/UnsupportedCallbackEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/response/ListWebhooksRequestDto.json b/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/response/ListWebhooksRequestDto.json deleted file mode 100644 index f6b331167..000000000 --- a/openapi-contracts/src/test/resources/domains/conversation/v1/webhooks/response/ListWebhooksRequestDto.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "webhooks": [ - { - "app_id": "an app id", - "target": "https://fake.url/ConversationEvent", - "target_type": "HTTP", - "secret": "my secret value", - "triggers": [ - "CAPABILITY", - "CHANNEL_EVENT", - "CONTACT_CREATE", - "UNSUPPORTED" - ], - "client_credentials": { - "client_id": "a client id", - "client_secret": "a client secret", - "endpoint": "https://fake.url", - "scope": "a scope", - "response_type": "a response type", - "token_request_type": "BASIC" - } - } - ] -}