diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 5c15727540dd..d5216551cf07 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -139,7 +139,7 @@ com.azure:azure-maps-geolocation;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-maps-render;2.0.0-beta.2;2.0.0-beta.3 com.azure:azure-maps-route;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-maps-search;2.0.0-beta.2;2.0.0-beta.3 -com.azure:azure-messaging-eventgrid;4.29.1;4.30.0-beta.1 +com.azure:azure-messaging-eventgrid;4.29.1;4.30.0 com.azure:azure-messaging-eventgrid-systemevents;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-messaging-eventgrid-namespaces;1.1.3;1.2.0-beta.1 com.azure:azure-messaging-eventgrid-cloudnative-cloudevents;1.0.0-beta.1;1.0.0-beta.2 diff --git a/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml index 76b40b80109c..a44fc606d11c 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml @@ -92,7 +92,7 @@ com.azure azure-messaging-eventgrid - 4.30.0-beta.1 + 4.30.0 com.azure diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/CHANGELOG.md b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/CHANGELOG.md index cdc7dd7eafaf..f8ae154fdf10 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/CHANGELOG.md +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/CHANGELOG.md @@ -1,14 +1,9 @@ # Release History -## 1.0.0-beta.2 (Unreleased) +## 1.0.0-beta.2 (2025-05-16) ### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +- Added new values to `SystemEventNames` related to Azure Communication Services and Azure Edge. ## 1.0.0-beta.1 (2025-02-26) diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java index 135184a930b7..3e3cb92aa32a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java @@ -3,6 +3,11 @@ package com.azure.messaging.eventgrid; +import com.azure.messaging.eventgrid.systemevents.AcsCallEndedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsCallParticipantAddedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsCallParticipantRemovedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsCallStartedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsChatAzureBotCommandReceivedInThreadEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatMessageDeletedEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatMessageDeletedInThreadEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatMessageEditedEventData; @@ -19,6 +24,7 @@ import com.azure.messaging.eventgrid.systemevents.AcsChatThreadPropertiesUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatThreadPropertiesUpdatedPerUserEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatThreadWithUserDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsChatTypingIndicatorReceivedInThreadEventData; import com.azure.messaging.eventgrid.systemevents.AcsEmailDeliveryReportReceivedEventData; import com.azure.messaging.eventgrid.systemevents.AcsEmailEngagementTrackingReportReceivedEventData; import com.azure.messaging.eventgrid.systemevents.AcsIncomingCallEventData; @@ -58,6 +64,8 @@ import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseDeletedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementApiUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerClosedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerOpenedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayApiAddedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayApiRemovedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayCertificateAuthorityCreatedEventData; @@ -68,6 +76,8 @@ import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationCreatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationDeletedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayTokenExpiredEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayTokenNearExpiryEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementProductCreatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementProductDeletedEventData; @@ -107,6 +117,7 @@ import com.azure.messaging.eventgrid.systemevents.DataBoxCopyCompletedEventData; import com.azure.messaging.eventgrid.systemevents.DataBoxCopyStartedEventData; import com.azure.messaging.eventgrid.systemevents.DataBoxOrderCompletedEventData; +import com.azure.messaging.eventgrid.systemevents.EdgeSolutionVersionPublishedEventData; import com.azure.messaging.eventgrid.systemevents.EventGridMqttClientCreatedOrUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.EventGridMqttClientDeletedEventData; import com.azure.messaging.eventgrid.systemevents.EventGridMqttClientSessionConnectedEventData; @@ -212,6 +223,33 @@ */ public final class SystemEventNames { + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallEnded event. + */ + public static final String ACS_CALL_ENDED = "Microsoft.Communication.CallEnded"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantAdded event. + */ + public static final String ACS_CALL_PARTICIPANT_ADDED = "Microsoft.Communication.CallParticipantAdded"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantRemoved event. + */ + public static final String ACS_CALL_PARTICIPANT_REMOVED = "Microsoft.Communication.CallParticipantRemoved"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallStarted event. + */ + public static final String ACS_CALL_STARTED = "Microsoft.Communication.CallStarted"; + + /** + * Schema of the Data property of an EventGridEvent for a + * Microsoft.Communication.ChatAzureBotCommandReceivedInThread event. + */ + public static final String ACS_CHAT_AZURE_BOT_COMMAND_RECEIVED_IN_THREAD + = "Microsoft.Communication.ChatAzureBotCommandReceivedInThread"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageDeleted event. */ @@ -304,6 +342,13 @@ public final class SystemEventNames { */ public static final String ACS_CHAT_THREAD_WITH_USER_DELETED = "Microsoft.Communication.ChatThreadWithUserDeleted"; + /** + * Schema of the Data property of an EventGridEvent for a + * Microsoft.Communication.ChatTypingIndicatorReceivedInThread event. + */ + public static final String ACS_CHAT_TYPING_INDICATOR_RECEIVED_IN_THREAD + = "Microsoft.Communication.ChatTypingIndicatorReceivedInThread"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.EmailDeliveryReportReceived event. */ @@ -511,6 +556,16 @@ public final class SystemEventNames { */ public static final String API_MANAGEMENT_API_UPDATED = "Microsoft.ApiManagement.APIUpdated"; + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Closed event. + */ + public static final String API_MANAGEMENT_CIRCUIT_BREAKER_CLOSED = "Microsoft.ApiManagement.CircuitBreaker.Closed"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Opened event. + */ + public static final String API_MANAGEMENT_CIRCUIT_BREAKER_OPENED = "Microsoft.ApiManagement.CircuitBreaker.Opened"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayAPIAdded event. */ @@ -573,6 +628,17 @@ public final class SystemEventNames { public static final String API_MANAGEMENT_GATEWAY_HOSTNAME_CONFIGURATION_UPDATED = "Microsoft.ApiManagement.GatewayHostnameConfigurationUpdated"; + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenExpired event. + */ + public static final String API_MANAGEMENT_GATEWAY_TOKEN_EXPIRED = "Microsoft.ApiManagement.GatewayTokenExpired"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenNearExpiry event. + */ + public static final String API_MANAGEMENT_GATEWAY_TOKEN_NEAR_EXPIRY + = "Microsoft.ApiManagement.GatewayTokenNearExpiry"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayUpdated event. */ @@ -775,6 +841,11 @@ public final class SystemEventNames { */ public static final String DATA_BOX_ORDER_COMPLETED = "Microsoft.DataBox.OrderCompleted"; + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Edge.SolutionVersionPublished event. + */ + public static final String EDGE_SOLUTION_VERSION_PUBLISHED = "Microsoft.Edge.SolutionVersionPublished"; + /** * Event data for Microsoft.EventGrid.MQTTClientCreatedOrUpdated event. */ @@ -1028,6 +1099,8 @@ public final class SystemEventNames { /** * Schema of the Data property of an event grid event for a + * Microsoft.ResourceNotifications.ContainerServiceEventResources.ScheduledEventEmitted preview event.Schema of the + * Data property of an event grid event for a * Microsoft.ResourceNotifications.ContainerServiceEventResources.ScheduledEventEmitted preview event. */ public static final String RESOURCE_NOTIFICATIONS_CONTAINER_SERVICE_EVENT_RESOURCES_SCHEDULED @@ -1267,6 +1340,11 @@ public final class SystemEventNames { private static final Map> SYSTEM_EVENT_MAPPINGS = new HashMap>() { { + put(ACS_CALL_ENDED, AcsCallEndedEventData.class); + put(ACS_CALL_PARTICIPANT_ADDED, AcsCallParticipantAddedEventData.class); + put(ACS_CALL_PARTICIPANT_REMOVED, AcsCallParticipantRemovedEventData.class); + put(ACS_CALL_STARTED, AcsCallStartedEventData.class); + put(ACS_CHAT_AZURE_BOT_COMMAND_RECEIVED_IN_THREAD, AcsChatAzureBotCommandReceivedInThreadEventData.class); put(ACS_CHAT_MESSAGE_DELETED, AcsChatMessageDeletedEventData.class); put(ACS_CHAT_MESSAGE_DELETED_IN_THREAD, AcsChatMessageDeletedInThreadEventData.class); put(ACS_CHAT_MESSAGE_EDITED, AcsChatMessageEditedEventData.class); @@ -1284,6 +1362,7 @@ public final class SystemEventNames { put(ACS_CHAT_THREAD_PROPERTIES_UPDATED, AcsChatThreadPropertiesUpdatedEventData.class); put(ACS_CHAT_THREAD_PROPERTIES_UPDATED_PER_USER, AcsChatThreadPropertiesUpdatedPerUserEventData.class); put(ACS_CHAT_THREAD_WITH_USER_DELETED, AcsChatThreadWithUserDeletedEventData.class); + put(ACS_CHAT_TYPING_INDICATOR_RECEIVED_IN_THREAD, AcsChatTypingIndicatorReceivedInThreadEventData.class); put(ACS_EMAIL_DELIVERY_REPORT_RECEIVED, AcsEmailDeliveryReportReceivedEventData.class); put(ACS_EMAIL_ENGAGEMENT_TRACKING_REPORT_RECEIVED, AcsEmailEngagementTrackingReportReceivedEventData.class); put(ACS_INCOMING_CALL, AcsIncomingCallEventData.class); @@ -1323,6 +1402,8 @@ public final class SystemEventNames { put(API_MANAGEMENT_API_RELEASE_DELETED, ApiManagementApiReleaseDeletedEventData.class); put(API_MANAGEMENT_API_RELEASE_UPDATED, ApiManagementApiReleaseUpdatedEventData.class); put(API_MANAGEMENT_API_UPDATED, ApiManagementApiUpdatedEventData.class); + put(API_MANAGEMENT_CIRCUIT_BREAKER_CLOSED, ApiManagementCircuitBreakerClosedEventData.class); + put(API_MANAGEMENT_CIRCUIT_BREAKER_OPENED, ApiManagementCircuitBreakerOpenedEventData.class); put(API_MANAGEMENT_GATEWAY_API_ADDED, ApiManagementGatewayApiAddedEventData.class); put(API_MANAGEMENT_GATEWAY_API_REMOVED, ApiManagementGatewayApiRemovedEventData.class); put(API_MANAGEMENT_GATEWAY_CERTIFICATE_AUTHORITY_CREATED, @@ -1339,6 +1420,8 @@ public final class SystemEventNames { ApiManagementGatewayHostnameConfigurationDeletedEventData.class); put(API_MANAGEMENT_GATEWAY_HOSTNAME_CONFIGURATION_UPDATED, ApiManagementGatewayHostnameConfigurationUpdatedEventData.class); + put(API_MANAGEMENT_GATEWAY_TOKEN_EXPIRED, ApiManagementGatewayTokenExpiredEventData.class); + put(API_MANAGEMENT_GATEWAY_TOKEN_NEAR_EXPIRY, ApiManagementGatewayTokenNearExpiryEventData.class); put(API_MANAGEMENT_GATEWAY_UPDATED, ApiManagementGatewayUpdatedEventData.class); put(API_MANAGEMENT_PRODUCT_CREATED, ApiManagementProductCreatedEventData.class); put(API_MANAGEMENT_PRODUCT_DELETED, ApiManagementProductDeletedEventData.class); @@ -1379,6 +1462,7 @@ public final class SystemEventNames { put(DATA_BOX_COPY_COMPLETED, DataBoxCopyCompletedEventData.class); put(DATA_BOX_COPY_STARTED, DataBoxCopyStartedEventData.class); put(DATA_BOX_ORDER_COMPLETED, DataBoxOrderCompletedEventData.class); + put(EDGE_SOLUTION_VERSION_PUBLISHED, EdgeSolutionVersionPublishedEventData.class); put(EVENT_GRID_MQTT_CLIENT_CREATED_OR_UPDATED, EventGridMqttClientCreatedOrUpdatedEventData.class); put(EVENT_GRID_MQTT_CLIENT_DELETED, EventGridMqttClientDeletedEventData.class); put(EVENT_GRID_MQTT_CLIENT_SESSION_CONNECTED, EventGridMqttClientSessionConnectedEventData.class); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/implementation/models/AcsRouterCommunicationError.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/implementation/models/AcsRouterCommunicationError.java index 93125770f4ca..2d4f96aeae7c 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/implementation/models/AcsRouterCommunicationError.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/implementation/models/AcsRouterCommunicationError.java @@ -46,19 +46,16 @@ public final class AcsRouterCommunicationError implements JsonSerializable details; + private List details; /** * Creates an instance of AcsRouterCommunicationError class. * * @param innererror the innererror value to set. - * @param details the details value to set. */ @Generated - private AcsRouterCommunicationError(AcsRouterCommunicationError innererror, - List details) { + private AcsRouterCommunicationError(AcsRouterCommunicationError innererror) { this.innererror = innererror; - this.details = details; } /** @@ -119,7 +116,6 @@ public List getDetails() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("innererror", this.innererror); - jsonWriter.writeArrayField("details", this.details, (writer, element) -> writer.writeJson(element)); jsonWriter.writeStringField("code", this.code); jsonWriter.writeStringField("message", this.message); jsonWriter.writeStringField("target", this.target); @@ -162,7 +158,8 @@ public static AcsRouterCommunicationError fromJson(JsonReader jsonReader) throws } } AcsRouterCommunicationError deserializedAcsRouterCommunicationError - = new AcsRouterCommunicationError(innererror, details); + = new AcsRouterCommunicationError(innererror); + deserializedAcsRouterCommunicationError.details = details; deserializedAcsRouterCommunicationError.code = code; deserializedAcsRouterCommunicationError.message = message; deserializedAcsRouterCommunicationError.target = target; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java new file mode 100644 index 000000000000..b354075e7ccb --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java @@ -0,0 +1,118 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event reason properties. + */ +@Immutable +public final class AcsCallEndReasonProperties implements JsonSerializable { + /* + * Reason code for ending the call. + */ + @Generated + private Integer code; + + /* + * Reason subcode for ending the call. + */ + @Generated + private Integer subCode; + + /* + * Reason for the ending the call. + */ + @Generated + private String phrase; + + /** + * Creates an instance of AcsCallEndReasonProperties class. + */ + @Generated + private AcsCallEndReasonProperties() { + } + + /** + * Get the code property: Reason code for ending the call. + * + * @return the code value. + */ + @Generated + public Integer getCode() { + return this.code; + } + + /** + * Get the subCode property: Reason subcode for ending the call. + * + * @return the subCode value. + */ + @Generated + public Integer getSubCode() { + return this.subCode; + } + + /** + * Get the phrase property: Reason for the ending the call. + * + * @return the phrase value. + */ + @Generated + public String getPhrase() { + return this.phrase; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeNumberField("code", this.code); + jsonWriter.writeNumberField("subCode", this.subCode); + jsonWriter.writeStringField("phrase", this.phrase); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallEndReasonProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallEndReasonProperties if the JsonReader was pointing to an instance of it, or null if + * it was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallEndReasonProperties. + */ + @Generated + public static AcsCallEndReasonProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallEndReasonProperties deserializedAcsCallEndReasonProperties = new AcsCallEndReasonProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("code".equals(fieldName)) { + deserializedAcsCallEndReasonProperties.code = reader.getNullable(JsonReader::getInt); + } else if ("subCode".equals(fieldName)) { + deserializedAcsCallEndReasonProperties.subCode = reader.getNullable(JsonReader::getInt); + } else if ("phrase".equals(fieldName)) { + deserializedAcsCallEndReasonProperties.phrase = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallEndReasonProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java new file mode 100644 index 000000000000..a79a598dfa13 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java @@ -0,0 +1,57 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * Call ended participant kind. + */ +public final class AcsCallEndedByKind extends ExpandableStringEnum { + /** + * Participant. + */ + @Generated + public static final AcsCallEndedByKind PARTICIPANT = fromString("Participant"); + + /** + * MicrosoftInternal. + */ + @Generated + public static final AcsCallEndedByKind MICROSOFT_INTERNAL = fromString("MicrosoftInternal"); + + /** + * Creates a new instance of AcsCallEndedByKind value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Generated + @Deprecated + public AcsCallEndedByKind() { + } + + /** + * Creates or finds a AcsCallEndedByKind from its string representation. + * + * @param name a name to look for. + * @return the corresponding AcsCallEndedByKind. + */ + @Generated + public static AcsCallEndedByKind fromString(String name) { + return fromString(name, AcsCallEndedByKind.class); + } + + /** + * Gets known AcsCallEndedByKind values. + * + * @return known AcsCallEndedByKind values. + */ + @Generated + public static Collection values() { + return values(AcsCallEndedByKind.class); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java new file mode 100644 index 000000000000..ffad516e1cbe --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java @@ -0,0 +1,128 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event ended by properties. + */ +@Immutable +public final class AcsCallEndedByProperties implements JsonSerializable { + /* + * The communication identifier of the call ended by + */ + @Generated + private final CommunicationIdentifierModel communicationIdentifier; + + /* + * The type of call ended by. + */ + @Generated + private final AcsCallEndedByKind type; + + /* + * The name of the call ended by. + */ + @Generated + private final String name; + + /** + * Creates an instance of AcsCallEndedByProperties class. + * + * @param communicationIdentifier the communicationIdentifier value to set. + * @param type the type value to set. + * @param name the name value to set. + */ + @Generated + private AcsCallEndedByProperties(CommunicationIdentifierModel communicationIdentifier, AcsCallEndedByKind type, + String name) { + this.communicationIdentifier = communicationIdentifier; + this.type = type; + this.name = name; + } + + /** + * Get the communicationIdentifier property: The communication identifier of the call ended by. + * + * @return the communicationIdentifier value. + */ + @Generated + public CommunicationIdentifierModel getCommunicationIdentifier() { + return this.communicationIdentifier; + } + + /** + * Get the type property: The type of call ended by. + * + * @return the type value. + */ + @Generated + public AcsCallEndedByKind getType() { + return this.type; + } + + /** + * Get the name property: The name of the call ended by. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("communicationIdentifier", this.communicationIdentifier); + jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString()); + jsonWriter.writeStringField("name", this.name); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallEndedByProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallEndedByProperties if the JsonReader was pointing to an instance of it, or null if + * it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallEndedByProperties. + */ + @Generated + public static AcsCallEndedByProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + CommunicationIdentifierModel communicationIdentifier = null; + AcsCallEndedByKind type = null; + String name = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("communicationIdentifier".equals(fieldName)) { + communicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("type".equals(fieldName)) { + type = AcsCallEndedByKind.fromString(reader.getString()); + } else if ("name".equals(fieldName)) { + name = reader.getString(); + } else { + reader.skipChildren(); + } + } + return new AcsCallEndedByProperties(communicationIdentifier, type, name); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java new file mode 100644 index 000000000000..dbf495d88bfa --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java @@ -0,0 +1,234 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.Duration; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallEnded event. + */ +@Immutable +public final class AcsCallEndedEventData extends AcsCallingEventProperties { + /* + * The communication identifier of the user who was disconnected + */ + @Generated + private AcsCallEndedByProperties endedBy; + + /* + * The reason for ending the call. + */ + @Generated + private AcsCallEndReasonProperties reason; + + /* + * Duration of the call in seconds. + */ + @Generated + private Double callDuration; + + /* + * Is the calling event a room call. + */ + @Generated + private Boolean isRoomsCall; + + /* + * Is two-party in calling event. + */ + @Generated + private Boolean isTwoParty; + + /* + * The room metadata + */ + @Generated + private AcsCallRoomProperties room; + + /* + * The group metadata + */ + @Generated + private AcsCallGroupProperties group; + + /** + * Creates an instance of AcsCallEndedEventData class. + * + * @param startedBy the startedBy value to set. + * @param serverCallId the serverCallId value to set. + * @param correlationId the correlationId value to set. + */ + @Generated + private AcsCallEndedEventData(AcsCallParticipantProperties startedBy, String serverCallId, String correlationId) { + super(startedBy, serverCallId, correlationId); + } + + /** + * Get the endedBy property: The communication identifier of the user who was disconnected. + * + * @return the endedBy value. + */ + @Generated + public AcsCallEndedByProperties getEndedBy() { + return this.endedBy; + } + + /** + * Get the reason property: The reason for ending the call. + * + * @return the reason value. + */ + @Generated + public AcsCallEndReasonProperties getReason() { + return this.reason; + } + + /** + * Get the callDuration property: Duration of the call in seconds. + * + * @return the callDuration value. + */ + @Generated + public Duration getCallDuration() { + if (this.callDuration == null) { + return null; + } + return Duration.ofNanos((long) (this.callDuration * 1000_000_000L)); + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + @Generated + @Override + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + @Generated + @Override + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Get the room property: The room metadata. + * + * @return the room value. + */ + @Generated + @Override + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + @Generated + @Override + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("endedBy", this.endedBy); + jsonWriter.writeJsonField("reason", this.reason); + jsonWriter.writeNumberField("callDurationInSeconds", this.callDuration); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallEndedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallEndedEventData if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallEndedEventData. + */ + @Generated + public static AcsCallEndedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties startedBy = null; + String serverCallId = null; + String correlationId = null; + AcsCallGroupProperties group = null; + AcsCallRoomProperties room = null; + Boolean isTwoParty = null; + Boolean isRoomsCall = null; + AcsCallEndedByProperties endedBy = null; + AcsCallEndReasonProperties reason = null; + Double callDuration = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else if ("endedBy".equals(fieldName)) { + endedBy = AcsCallEndedByProperties.fromJson(reader); + } else if ("reason".equals(fieldName)) { + reason = AcsCallEndReasonProperties.fromJson(reader); + } else if ("callDurationInSeconds".equals(fieldName)) { + callDuration = reader.getNullable(JsonReader::getDouble); + } else { + reader.skipChildren(); + } + } + AcsCallEndedEventData deserializedAcsCallEndedEventData + = new AcsCallEndedEventData(startedBy, serverCallId, correlationId); + deserializedAcsCallEndedEventData.group = group; + deserializedAcsCallEndedEventData.room = room; + deserializedAcsCallEndedEventData.isTwoParty = isTwoParty; + deserializedAcsCallEndedEventData.isRoomsCall = isRoomsCall; + deserializedAcsCallEndedEventData.endedBy = endedBy; + deserializedAcsCallEndedEventData.reason = reason; + deserializedAcsCallEndedEventData.callDuration = callDuration; + + return deserializedAcsCallEndedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java new file mode 100644 index 000000000000..bc1399fddb62 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java @@ -0,0 +1,80 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event group properties. + */ +@Immutable +public final class AcsCallGroupProperties implements JsonSerializable { + /* + * Group Id. + */ + @Generated + private String id; + + /** + * Creates an instance of AcsCallGroupProperties class. + */ + @Generated + private AcsCallGroupProperties() { + } + + /** + * Get the id property: Group Id. + * + * @return the id value. + */ + @Generated + public String getId() { + return this.id; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("id", this.id); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallGroupProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallGroupProperties if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallGroupProperties. + */ + @Generated + public static AcsCallGroupProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallGroupProperties deserializedAcsCallGroupProperties = new AcsCallGroupProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("id".equals(fieldName)) { + deserializedAcsCallGroupProperties.id = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallGroupProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java new file mode 100644 index 000000000000..b2e67934ba25 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java @@ -0,0 +1,256 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantAdded event. + */ +@Immutable +public final class AcsCallParticipantAddedEventData extends AcsCallParticipantEventProperties { + /* + * The user agent of the participant. + */ + @Generated + private String userAgent; + + /* + * The id of the participant. + */ + @Generated + private String participantId; + + /* + * The display name of the participant. + */ + @Generated + private String displayName; + + /* + * The user of the call participant + */ + @Generated + private AcsCallParticipantProperties user; + + /* + * Is the calling event a room call. + */ + @Generated + private Boolean isRoomsCall; + + /* + * Is two-party in calling event. + */ + @Generated + private Boolean isTwoParty; + + /* + * The room metadata + */ + @Generated + private AcsCallRoomProperties room; + + /* + * The group metadata + */ + @Generated + private AcsCallGroupProperties group; + + /** + * Creates an instance of AcsCallParticipantAddedEventData class. + * + * @param startedBy the startedBy value to set. + * @param serverCallId the serverCallId value to set. + * @param correlationId the correlationId value to set. + */ + @Generated + private AcsCallParticipantAddedEventData(AcsCallParticipantProperties startedBy, String serverCallId, + String correlationId) { + super(startedBy, serverCallId, correlationId); + } + + /** + * Get the userAgent property: The user agent of the participant. + * + * @return the userAgent value. + */ + @Generated + @Override + public String getUserAgent() { + return this.userAgent; + } + + /** + * Get the participantId property: The id of the participant. + * + * @return the participantId value. + */ + @Generated + @Override + public String getParticipantId() { + return this.participantId; + } + + /** + * Get the displayName property: The display name of the participant. + * + * @return the displayName value. + */ + @Generated + @Override + public String getDisplayName() { + return this.displayName; + } + + /** + * Get the user property: The user of the call participant. + * + * @return the user value. + */ + @Generated + @Override + public AcsCallParticipantProperties getUser() { + return this.user; + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + @Generated + @Override + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + @Generated + @Override + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Get the room property: The room metadata. + * + * @return the room value. + */ + @Generated + @Override + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + @Generated + @Override + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("user", getUser()); + jsonWriter.writeStringField("displayName", getDisplayName()); + jsonWriter.writeStringField("participantId", getParticipantId()); + jsonWriter.writeStringField("userAgent", getUserAgent()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantAddedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantAddedEventData if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallParticipantAddedEventData. + */ + @Generated + public static AcsCallParticipantAddedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties startedBy = null; + String serverCallId = null; + String correlationId = null; + AcsCallGroupProperties group = null; + AcsCallRoomProperties room = null; + Boolean isTwoParty = null; + Boolean isRoomsCall = null; + AcsCallParticipantProperties user = null; + String displayName = null; + String participantId = null; + String userAgent = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else if ("user".equals(fieldName)) { + user = AcsCallParticipantProperties.fromJson(reader); + } else if ("displayName".equals(fieldName)) { + displayName = reader.getString(); + } else if ("participantId".equals(fieldName)) { + participantId = reader.getString(); + } else if ("userAgent".equals(fieldName)) { + userAgent = reader.getString(); + } else { + reader.skipChildren(); + } + } + AcsCallParticipantAddedEventData deserializedAcsCallParticipantAddedEventData + = new AcsCallParticipantAddedEventData(startedBy, serverCallId, correlationId); + deserializedAcsCallParticipantAddedEventData.group = group; + deserializedAcsCallParticipantAddedEventData.room = room; + deserializedAcsCallParticipantAddedEventData.isTwoParty = isTwoParty; + deserializedAcsCallParticipantAddedEventData.isRoomsCall = isRoomsCall; + deserializedAcsCallParticipantAddedEventData.user = user; + deserializedAcsCallParticipantAddedEventData.displayName = displayName; + deserializedAcsCallParticipantAddedEventData.participantId = participantId; + deserializedAcsCallParticipantAddedEventData.userAgent = userAgent; + + return deserializedAcsCallParticipantAddedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventProperties.java new file mode 100644 index 000000000000..e78aff80c13e --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventProperties.java @@ -0,0 +1,300 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of common properties of all participant events. + */ +@Immutable +public class AcsCallParticipantEventProperties extends AcsCallingEventProperties { + /* + * The user of the call participant + */ + @Generated + private AcsCallParticipantProperties user; + + /* + * The display name of the participant. + */ + @Generated + private String displayName; + + /* + * The id of the participant. + */ + @Generated + private String participantId; + + /* + * The user agent of the participant. + */ + @Generated + private String userAgent; + + /* + * Is the calling event a room call. + */ + @Generated + private Boolean isRoomsCall; + + /* + * Is two-party in calling event. + */ + @Generated + private Boolean isTwoParty; + + /* + * The room metadata + */ + @Generated + private AcsCallRoomProperties room; + + /* + * The group metadata + */ + @Generated + private AcsCallGroupProperties group; + + /** + * Creates an instance of AcsCallParticipantEventProperties class. + * + * @param startedBy the startedBy value to set. + * @param serverCallId the serverCallId value to set. + * @param correlationId the correlationId value to set. + */ + @Generated + protected AcsCallParticipantEventProperties(AcsCallParticipantProperties startedBy, String serverCallId, + String correlationId) { + super(startedBy, serverCallId, correlationId); + } + + /** + * Get the user property: The user of the call participant. + * + * @return the user value. + */ + @Generated + public AcsCallParticipantProperties getUser() { + return this.user; + } + + /** + * Set the user property: The user of the call participant. + * + * @param user the user value to set. + * @return the AcsCallParticipantEventProperties object itself. + */ + @Generated + AcsCallParticipantEventProperties setUser(AcsCallParticipantProperties user) { + this.user = user; + return this; + } + + /** + * Get the displayName property: The display name of the participant. + * + * @return the displayName value. + */ + @Generated + public String getDisplayName() { + return this.displayName; + } + + /** + * Set the displayName property: The display name of the participant. + * + * @param displayName the displayName value to set. + * @return the AcsCallParticipantEventProperties object itself. + */ + @Generated + AcsCallParticipantEventProperties setDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + /** + * Get the participantId property: The id of the participant. + * + * @return the participantId value. + */ + @Generated + public String getParticipantId() { + return this.participantId; + } + + /** + * Set the participantId property: The id of the participant. + * + * @param participantId the participantId value to set. + * @return the AcsCallParticipantEventProperties object itself. + */ + @Generated + AcsCallParticipantEventProperties setParticipantId(String participantId) { + this.participantId = participantId; + return this; + } + + /** + * Get the userAgent property: The user agent of the participant. + * + * @return the userAgent value. + */ + @Generated + public String getUserAgent() { + return this.userAgent; + } + + /** + * Set the userAgent property: The user agent of the participant. + * + * @param userAgent the userAgent value to set. + * @return the AcsCallParticipantEventProperties object itself. + */ + @Generated + AcsCallParticipantEventProperties setUserAgent(String userAgent) { + this.userAgent = userAgent; + return this; + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + @Generated + @Override + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + @Generated + @Override + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Get the room property: The room metadata. + * + * @return the room value. + */ + @Generated + @Override + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + @Generated + @Override + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("user", this.user); + jsonWriter.writeStringField("displayName", this.displayName); + jsonWriter.writeStringField("participantId", this.participantId); + jsonWriter.writeStringField("userAgent", this.userAgent); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantEventProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantEventProperties if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallParticipantEventProperties. + */ + @Generated + public static AcsCallParticipantEventProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties startedBy = null; + String serverCallId = null; + String correlationId = null; + AcsCallGroupProperties group = null; + AcsCallRoomProperties room = null; + Boolean isTwoParty = null; + Boolean isRoomsCall = null; + AcsCallParticipantProperties user = null; + String displayName = null; + String participantId = null; + String userAgent = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else if ("user".equals(fieldName)) { + user = AcsCallParticipantProperties.fromJson(reader); + } else if ("displayName".equals(fieldName)) { + displayName = reader.getString(); + } else if ("participantId".equals(fieldName)) { + participantId = reader.getString(); + } else if ("userAgent".equals(fieldName)) { + userAgent = reader.getString(); + } else { + reader.skipChildren(); + } + } + AcsCallParticipantEventProperties deserializedAcsCallParticipantEventProperties + = new AcsCallParticipantEventProperties(startedBy, serverCallId, correlationId); + deserializedAcsCallParticipantEventProperties.group = group; + deserializedAcsCallParticipantEventProperties.room = room; + deserializedAcsCallParticipantEventProperties.isTwoParty = isTwoParty; + deserializedAcsCallParticipantEventProperties.isRoomsCall = isRoomsCall; + deserializedAcsCallParticipantEventProperties.user = user; + deserializedAcsCallParticipantEventProperties.displayName = displayName; + deserializedAcsCallParticipantEventProperties.participantId = participantId; + deserializedAcsCallParticipantEventProperties.userAgent = userAgent; + + return deserializedAcsCallParticipantEventProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java new file mode 100644 index 000000000000..f5d038a23ef0 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java @@ -0,0 +1,101 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of common properties of all participant event user. + */ +@Immutable +public final class AcsCallParticipantProperties implements JsonSerializable { + /* + * The communication identifier of the participant user + */ + @Generated + private CommunicationIdentifierModel communicationIdentifier; + + /* + * The role of the participant + */ + @Generated + private AcsCallParticipantRoleKind role; + + /** + * Creates an instance of AcsCallParticipantProperties class. + */ + @Generated + private AcsCallParticipantProperties() { + } + + /** + * Get the communicationIdentifier property: The communication identifier of the participant user. + * + * @return the communicationIdentifier value. + */ + @Generated + public CommunicationIdentifierModel getCommunicationIdentifier() { + return this.communicationIdentifier; + } + + /** + * Get the role property: The role of the participant. + * + * @return the role value. + */ + @Generated + public AcsCallParticipantRoleKind getRole() { + return this.role; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("communicationIdentifier", this.communicationIdentifier); + jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantProperties if the JsonReader was pointing to an instance of it, or null + * if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallParticipantProperties. + */ + @Generated + public static AcsCallParticipantProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties deserializedAcsCallParticipantProperties = new AcsCallParticipantProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("communicationIdentifier".equals(fieldName)) { + deserializedAcsCallParticipantProperties.communicationIdentifier + = CommunicationIdentifierModel.fromJson(reader); + } else if ("role".equals(fieldName)) { + deserializedAcsCallParticipantProperties.role + = AcsCallParticipantRoleKind.fromString(reader.getString()); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallParticipantProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java new file mode 100644 index 000000000000..a61fe7ee51d7 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java @@ -0,0 +1,256 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantRemoved event. + */ +@Immutable +public final class AcsCallParticipantRemovedEventData extends AcsCallParticipantEventProperties { + /* + * The user agent of the participant. + */ + @Generated + private String userAgent; + + /* + * The id of the participant. + */ + @Generated + private String participantId; + + /* + * The display name of the participant. + */ + @Generated + private String displayName; + + /* + * The user of the call participant + */ + @Generated + private AcsCallParticipantProperties user; + + /* + * Is the calling event a room call. + */ + @Generated + private Boolean isRoomsCall; + + /* + * Is two-party in calling event. + */ + @Generated + private Boolean isTwoParty; + + /* + * The room metadata + */ + @Generated + private AcsCallRoomProperties room; + + /* + * The group metadata + */ + @Generated + private AcsCallGroupProperties group; + + /** + * Creates an instance of AcsCallParticipantRemovedEventData class. + * + * @param startedBy the startedBy value to set. + * @param serverCallId the serverCallId value to set. + * @param correlationId the correlationId value to set. + */ + @Generated + private AcsCallParticipantRemovedEventData(AcsCallParticipantProperties startedBy, String serverCallId, + String correlationId) { + super(startedBy, serverCallId, correlationId); + } + + /** + * Get the userAgent property: The user agent of the participant. + * + * @return the userAgent value. + */ + @Generated + @Override + public String getUserAgent() { + return this.userAgent; + } + + /** + * Get the participantId property: The id of the participant. + * + * @return the participantId value. + */ + @Generated + @Override + public String getParticipantId() { + return this.participantId; + } + + /** + * Get the displayName property: The display name of the participant. + * + * @return the displayName value. + */ + @Generated + @Override + public String getDisplayName() { + return this.displayName; + } + + /** + * Get the user property: The user of the call participant. + * + * @return the user value. + */ + @Generated + @Override + public AcsCallParticipantProperties getUser() { + return this.user; + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + @Generated + @Override + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + @Generated + @Override + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Get the room property: The room metadata. + * + * @return the room value. + */ + @Generated + @Override + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + @Generated + @Override + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("user", getUser()); + jsonWriter.writeStringField("displayName", getDisplayName()); + jsonWriter.writeStringField("participantId", getParticipantId()); + jsonWriter.writeStringField("userAgent", getUserAgent()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantRemovedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantRemovedEventData if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallParticipantRemovedEventData. + */ + @Generated + public static AcsCallParticipantRemovedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties startedBy = null; + String serverCallId = null; + String correlationId = null; + AcsCallGroupProperties group = null; + AcsCallRoomProperties room = null; + Boolean isTwoParty = null; + Boolean isRoomsCall = null; + AcsCallParticipantProperties user = null; + String displayName = null; + String participantId = null; + String userAgent = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else if ("user".equals(fieldName)) { + user = AcsCallParticipantProperties.fromJson(reader); + } else if ("displayName".equals(fieldName)) { + displayName = reader.getString(); + } else if ("participantId".equals(fieldName)) { + participantId = reader.getString(); + } else if ("userAgent".equals(fieldName)) { + userAgent = reader.getString(); + } else { + reader.skipChildren(); + } + } + AcsCallParticipantRemovedEventData deserializedAcsCallParticipantRemovedEventData + = new AcsCallParticipantRemovedEventData(startedBy, serverCallId, correlationId); + deserializedAcsCallParticipantRemovedEventData.group = group; + deserializedAcsCallParticipantRemovedEventData.room = room; + deserializedAcsCallParticipantRemovedEventData.isTwoParty = isTwoParty; + deserializedAcsCallParticipantRemovedEventData.isRoomsCall = isRoomsCall; + deserializedAcsCallParticipantRemovedEventData.user = user; + deserializedAcsCallParticipantRemovedEventData.displayName = displayName; + deserializedAcsCallParticipantRemovedEventData.participantId = participantId; + deserializedAcsCallParticipantRemovedEventData.userAgent = userAgent; + + return deserializedAcsCallParticipantRemovedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRoleKind.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRoleKind.java new file mode 100644 index 000000000000..ff2a79858a7a --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRoleKind.java @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * Call participant role kind. + */ +public final class AcsCallParticipantRoleKind extends ExpandableStringEnum { + /** + * Attendee. + */ + @Generated + public static final AcsCallParticipantRoleKind ATTENDEE = fromString("Attendee"); + + /** + * Presenter. + */ + @Generated + public static final AcsCallParticipantRoleKind PRESENTER = fromString("Presenter"); + + /** + * Organizer. + */ + @Generated + public static final AcsCallParticipantRoleKind ORGANIZER = fromString("Organizer"); + + /** + * Consumer. + */ + @Generated + public static final AcsCallParticipantRoleKind CONSUMER = fromString("Consumer"); + + /** + * Collaborator. + */ + @Generated + public static final AcsCallParticipantRoleKind COLLABORATOR = fromString("Collaborator"); + + /** + * Creates a new instance of AcsCallParticipantRoleKind value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Generated + @Deprecated + public AcsCallParticipantRoleKind() { + } + + /** + * Creates or finds a AcsCallParticipantRoleKind from its string representation. + * + * @param name a name to look for. + * @return the corresponding AcsCallParticipantRoleKind. + */ + @Generated + public static AcsCallParticipantRoleKind fromString(String name) { + return fromString(name, AcsCallParticipantRoleKind.class); + } + + /** + * Gets known AcsCallParticipantRoleKind values. + * + * @return known AcsCallParticipantRoleKind values. + */ + @Generated + public static Collection values() { + return values(AcsCallParticipantRoleKind.class); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java new file mode 100644 index 000000000000..851a59637dd9 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java @@ -0,0 +1,80 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event room properties. + */ +@Immutable +public final class AcsCallRoomProperties implements JsonSerializable { + /* + * Room Id. + */ + @Generated + private String id; + + /** + * Creates an instance of AcsCallRoomProperties class. + */ + @Generated + private AcsCallRoomProperties() { + } + + /** + * Get the id property: Room Id. + * + * @return the id value. + */ + @Generated + public String getId() { + return this.id; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("id", this.id); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallRoomProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallRoomProperties if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallRoomProperties. + */ + @Generated + public static AcsCallRoomProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallRoomProperties deserializedAcsCallRoomProperties = new AcsCallRoomProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("id".equals(fieldName)) { + deserializedAcsCallRoomProperties.id = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallRoomProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java new file mode 100644 index 000000000000..e74bc0a6d7ee --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java @@ -0,0 +1,167 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallStarted event. + */ +@Immutable +public final class AcsCallStartedEventData extends AcsCallingEventProperties { + /* + * Is the calling event a room call. + */ + @Generated + private Boolean isRoomsCall; + + /* + * Is two-party in calling event. + */ + @Generated + private Boolean isTwoParty; + + /* + * The room metadata + */ + @Generated + private AcsCallRoomProperties room; + + /* + * The group metadata + */ + @Generated + private AcsCallGroupProperties group; + + /** + * Creates an instance of AcsCallStartedEventData class. + * + * @param startedBy the startedBy value to set. + * @param serverCallId the serverCallId value to set. + * @param correlationId the correlationId value to set. + */ + @Generated + private AcsCallStartedEventData(AcsCallParticipantProperties startedBy, String serverCallId, String correlationId) { + super(startedBy, serverCallId, correlationId); + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + @Generated + @Override + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + @Generated + @Override + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Get the room property: The room metadata. + * + * @return the room value. + */ + @Generated + @Override + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + @Generated + @Override + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallStartedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallStartedEventData if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallStartedEventData. + */ + @Generated + public static AcsCallStartedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties startedBy = null; + String serverCallId = null; + String correlationId = null; + AcsCallGroupProperties group = null; + AcsCallRoomProperties room = null; + Boolean isTwoParty = null; + Boolean isRoomsCall = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else { + reader.skipChildren(); + } + } + AcsCallStartedEventData deserializedAcsCallStartedEventData + = new AcsCallStartedEventData(startedBy, serverCallId, correlationId); + deserializedAcsCallStartedEventData.group = group; + deserializedAcsCallStartedEventData.room = room; + deserializedAcsCallStartedEventData.isTwoParty = isTwoParty; + deserializedAcsCallStartedEventData.isRoomsCall = isRoomsCall; + + return deserializedAcsCallStartedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java new file mode 100644 index 000000000000..d65825085008 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java @@ -0,0 +1,263 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of common properties of all calling events. + */ +@Immutable +public class AcsCallingEventProperties implements JsonSerializable { + /* + * The call participant who initiated the call. + */ + @Generated + private final AcsCallParticipantProperties startedBy; + + /* + * The call id of the server + */ + @Generated + private final String serverCallId; + + /* + * The group metadata + */ + @Generated + private AcsCallGroupProperties group; + + /* + * The room metadata + */ + @Generated + private AcsCallRoomProperties room; + + /* + * Is two-party in calling event. + */ + @Generated + private Boolean isTwoParty; + + /* + * The correlationId of calling event + */ + @Generated + private final String correlationId; + + /* + * Is the calling event a room call. + */ + @Generated + private Boolean isRoomsCall; + + /** + * Creates an instance of AcsCallingEventProperties class. + * + * @param startedBy the startedBy value to set. + * @param serverCallId the serverCallId value to set. + * @param correlationId the correlationId value to set. + */ + @Generated + protected AcsCallingEventProperties(AcsCallParticipantProperties startedBy, String serverCallId, + String correlationId) { + this.startedBy = startedBy; + this.serverCallId = serverCallId; + this.correlationId = correlationId; + } + + /** + * Get the startedBy property: The call participant who initiated the call. + * + * @return the startedBy value. + */ + @Generated + public AcsCallParticipantProperties getStartedBy() { + return this.startedBy; + } + + /** + * Get the serverCallId property: The call id of the server. + * + * @return the serverCallId value. + */ + @Generated + public String getServerCallId() { + return this.serverCallId; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + @Generated + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * Set the group property: The group metadata. + * + * @param group the group value to set. + * @return the AcsCallingEventProperties object itself. + */ + @Generated + AcsCallingEventProperties setGroup(AcsCallGroupProperties group) { + this.group = group; + return this; + } + + /** + * Get the room property: The room metadata. + * + * @return the room value. + */ + @Generated + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Set the room property: The room metadata. + * + * @param room the room value to set. + * @return the AcsCallingEventProperties object itself. + */ + @Generated + AcsCallingEventProperties setRoom(AcsCallRoomProperties room) { + this.room = room; + return this; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + @Generated + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Set the isTwoParty property: Is two-party in calling event. + * + * @param isTwoParty the isTwoParty value to set. + * @return the AcsCallingEventProperties object itself. + */ + @Generated + AcsCallingEventProperties setIsTwoParty(Boolean isTwoParty) { + this.isTwoParty = isTwoParty; + return this; + } + + /** + * Get the correlationId property: The correlationId of calling event. + * + * @return the correlationId value. + */ + @Generated + public String getCorrelationId() { + return this.correlationId; + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + @Generated + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Set the isRoomsCall property: Is the calling event a room call. + * + * @param isRoomsCall the isRoomsCall value to set. + * @return the AcsCallingEventProperties object itself. + */ + @Generated + AcsCallingEventProperties setIsRoomsCall(Boolean isRoomsCall) { + this.isRoomsCall = isRoomsCall; + return this; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", this.startedBy); + jsonWriter.writeStringField("serverCallId", this.serverCallId); + jsonWriter.writeStringField("correlationId", this.correlationId); + jsonWriter.writeJsonField("group", this.group); + jsonWriter.writeJsonField("room", this.room); + jsonWriter.writeBooleanField("isTwoParty", this.isTwoParty); + jsonWriter.writeBooleanField("isRoomsCall", this.isRoomsCall); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallingEventProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallingEventProperties if the JsonReader was pointing to an instance of it, or null if + * it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallingEventProperties. + */ + @Generated + public static AcsCallingEventProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties startedBy = null; + String serverCallId = null; + String correlationId = null; + AcsCallGroupProperties group = null; + AcsCallRoomProperties room = null; + Boolean isTwoParty = null; + Boolean isRoomsCall = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else { + reader.skipChildren(); + } + } + AcsCallingEventProperties deserializedAcsCallingEventProperties + = new AcsCallingEventProperties(startedBy, serverCallId, correlationId); + deserializedAcsCallingEventProperties.group = group; + deserializedAcsCallingEventProperties.room = room; + deserializedAcsCallingEventProperties.isTwoParty = isTwoParty; + deserializedAcsCallingEventProperties.isRoomsCall = isRoomsCall; + + return deserializedAcsCallingEventProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java new file mode 100644 index 000000000000..c0829d33e87e --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java @@ -0,0 +1,191 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatAzureBotCommandReceivedInThread + * event. + */ +@Immutable +public final class AcsChatAzureBotCommandReceivedInThreadEventData extends AcsChatMessageEventInThreadBaseProperties { + /* + * The body of the chat message + */ + @Generated + private final String messageBody; + + /* + * The chat message metadata + */ + @Generated + private Map metadata; + + /* + * The display name of the sender + */ + @Generated + private String senderDisplayName; + + /* + * The transaction id will be used as co-relation vector + */ + @Generated + private String transactionId; + + /** + * Creates an instance of AcsChatAzureBotCommandReceivedInThreadEventData class. + * + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. + * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. + * @param composeTime the composeTime value to set. + * @param type the type value to set. + * @param version the version value to set. + * @param messageBody the messageBody value to set. + */ + @Generated + private AcsChatAzureBotCommandReceivedInThreadEventData(String threadId, String messageId, + CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, String type, + long version, String messageBody) { + super(threadId, messageId, senderCommunicationIdentifier, composeTime, type, version); + this.messageBody = messageBody; + } + + /** + * Get the messageBody property: The body of the chat message. + * + * @return the messageBody value. + */ + @Generated + public String getMessageBody() { + return this.messageBody; + } + + /** + * Get the metadata property: The chat message metadata. + * + * @return the metadata value. + */ + @Generated + public Map getMetadata() { + return this.metadata; + } + + /** + * Get the senderDisplayName property: The display name of the sender. + * + * @return the senderDisplayName value. + */ + @Generated + @Override + public String getSenderDisplayName() { + return this.senderDisplayName; + } + + /** + * Get the transactionId property: The transaction id will be used as co-relation vector. + * + * @return the transactionId value. + */ + @Generated + @Override + public String getTransactionId() { + return this.transactionId; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("composeTime", + getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); + jsonWriter.writeStringField("transactionId", getTransactionId()); + jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); + jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsChatAzureBotCommandReceivedInThreadEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsChatAzureBotCommandReceivedInThreadEventData if the JsonReader was pointing to an + * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsChatAzureBotCommandReceivedInThreadEventData. + */ + @Generated + public static AcsChatAzureBotCommandReceivedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String threadId = null; + String messageId = null; + CommunicationIdentifierModel senderCommunicationIdentifier = null; + OffsetDateTime composeTime = null; + String type = null; + long version = 0L; + String transactionId = null; + String senderDisplayName = null; + String messageBody = null; + Map metadata = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("composeTime".equals(fieldName)) { + composeTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); + } else if ("senderDisplayName".equals(fieldName)) { + senderDisplayName = reader.getString(); + } else if ("messageBody".equals(fieldName)) { + messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); + } else { + reader.skipChildren(); + } + } + AcsChatAzureBotCommandReceivedInThreadEventData deserializedAcsChatAzureBotCommandReceivedInThreadEventData + = new AcsChatAzureBotCommandReceivedInThreadEventData(threadId, messageId, + senderCommunicationIdentifier, composeTime, type, version, messageBody); + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.transactionId = transactionId; + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.senderDisplayName = senderDisplayName; + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.metadata = metadata; + + return deserializedAcsChatAzureBotCommandReceivedInThreadEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventBaseProperties.java index 028e05610522..23ceb6d8707a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventBaseProperties.java @@ -33,16 +33,19 @@ public class AcsChatEventBaseProperties implements JsonSerializable { CommunicationIdentifierModel recipientCommunicationIdentifier = null; - String transactionId = null; String threadId = null; + String transactionId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); - } else if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); } else if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); } else { reader.skipChildren(); } } AcsChatEventBaseProperties deserializedAcsChatEventBaseProperties - = new AcsChatEventBaseProperties(recipientCommunicationIdentifier); + = new AcsChatEventBaseProperties(recipientCommunicationIdentifier, threadId); deserializedAcsChatEventBaseProperties.transactionId = transactionId; - deserializedAcsChatEventBaseProperties.threadId = threadId; return deserializedAcsChatEventBaseProperties; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java index 188a745840b5..e01fd3c6940b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java @@ -27,13 +27,16 @@ public class AcsChatEventInThreadBaseProperties implements JsonSerializable { - AcsChatEventInThreadBaseProperties deserializedAcsChatEventInThreadBaseProperties - = new AcsChatEventInThreadBaseProperties(); + String threadId = null; + String transactionId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("transactionId".equals(fieldName)) { - deserializedAcsChatEventInThreadBaseProperties.transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - deserializedAcsChatEventInThreadBaseProperties.threadId = reader.getString(); + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); } else { reader.skipChildren(); } } + AcsChatEventInThreadBaseProperties deserializedAcsChatEventInThreadBaseProperties + = new AcsChatEventInThreadBaseProperties(threadId); + deserializedAcsChatEventInThreadBaseProperties.transactionId = transactionId; return deserializedAcsChatEventInThreadBaseProperties; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java index faebe4036f89..b541dcf5ebe7 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java @@ -25,36 +25,12 @@ public final class AcsChatMessageDeletedEventData extends AcsChatMessageEventBas @Generated private final OffsetDateTime deleteTime; - /* - * The version of the message - */ - @Generated - private Long version; - - /* - * The type of the message - */ - @Generated - private String type; - /* * The display name of the sender */ @Generated private String senderDisplayName; - /* - * The chat message id - */ - @Generated - private String messageId; - - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -65,15 +41,20 @@ public final class AcsChatMessageDeletedEventData extends AcsChatMessageEventBas * Creates an instance of AcsChatMessageDeletedEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. + * @param type the type value to set. + * @param version the version value to set. * @param deleteTime the deleteTime value to set. */ @Generated private AcsChatMessageDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, - CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, - OffsetDateTime deleteTime) { - super(recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime); + String threadId, String messageId, CommunicationIdentifierModel senderCommunicationIdentifier, + OffsetDateTime composeTime, String type, long version, OffsetDateTime deleteTime) { + super(recipientCommunicationIdentifier, threadId, messageId, senderCommunicationIdentifier, composeTime, type, + version); this.deleteTime = deleteTime; } @@ -87,28 +68,6 @@ public OffsetDateTime getDeleteTime() { return this.deleteTime; } - /** - * Get the version property: The version of the message. - * - * @return the version value. - */ - @Generated - @Override - public Long getVersion() { - return this.version; - } - - /** - * Get the type property: The type of the message. - * - * @return the type value. - */ - @Generated - @Override - public String getType() { - return this.type; - } - /** * Get the senderDisplayName property: The display name of the sender. * @@ -120,28 +79,6 @@ public String getSenderDisplayName() { return this.senderDisplayName; } - /** - * Get the messageId property: The chat message id. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -161,15 +98,15 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); - jsonWriter.writeStringField("type", getType()); - jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("deleteTime", this.deleteTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deleteTime)); return jsonWriter.writeEndObject(); @@ -188,14 +125,14 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; + String type = null; + long version = 0L; String transactionId = null; - String threadId = null; - String messageId = null; String senderDisplayName = null; - String type = null; - Long version = null; OffsetDateTime deleteTime = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); @@ -203,23 +140,23 @@ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) thr if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { senderDisplayName = reader.getString(); - } else if ("type".equals(fieldName)) { - type = reader.getString(); - } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); } else if ("deleteTime".equals(fieldName)) { deleteTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); @@ -228,14 +165,10 @@ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) thr } } AcsChatMessageDeletedEventData deserializedAcsChatMessageDeletedEventData - = new AcsChatMessageDeletedEventData(recipientCommunicationIdentifier, senderCommunicationIdentifier, - composeTime, deleteTime); + = new AcsChatMessageDeletedEventData(recipientCommunicationIdentifier, threadId, messageId, + senderCommunicationIdentifier, composeTime, type, version, deleteTime); deserializedAcsChatMessageDeletedEventData.transactionId = transactionId; - deserializedAcsChatMessageDeletedEventData.threadId = threadId; - deserializedAcsChatMessageDeletedEventData.messageId = messageId; deserializedAcsChatMessageDeletedEventData.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageDeletedEventData.type = type; - deserializedAcsChatMessageDeletedEventData.version = version; return deserializedAcsChatMessageDeletedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java index 68d155f5f6ae..05886185c2e3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java @@ -25,36 +25,12 @@ public final class AcsChatMessageDeletedInThreadEventData extends AcsChatMessage @Generated private final OffsetDateTime deleteTime; - /* - * The version of the message - */ - @Generated - private Long version; - - /* - * The type of the message - */ - @Generated - private String type; - /* * The display name of the sender */ @Generated private String senderDisplayName; - /* - * The chat message id - */ - @Generated - private String messageId; - - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -64,14 +40,19 @@ public final class AcsChatMessageDeletedInThreadEventData extends AcsChatMessage /** * Creates an instance of AcsChatMessageDeletedInThreadEventData class. * + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. + * @param type the type value to set. + * @param version the version value to set. * @param deleteTime the deleteTime value to set. */ @Generated - private AcsChatMessageDeletedInThreadEventData(CommunicationIdentifierModel senderCommunicationIdentifier, - OffsetDateTime composeTime, OffsetDateTime deleteTime) { - super(senderCommunicationIdentifier, composeTime); + private AcsChatMessageDeletedInThreadEventData(String threadId, String messageId, + CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, String type, + long version, OffsetDateTime deleteTime) { + super(threadId, messageId, senderCommunicationIdentifier, composeTime, type, version); this.deleteTime = deleteTime; } @@ -85,28 +66,6 @@ public OffsetDateTime getDeleteTime() { return this.deleteTime; } - /** - * Get the version property: The version of the message. - * - * @return the version value. - */ - @Generated - @Override - public Long getVersion() { - return this.version; - } - - /** - * Get the type property: The type of the message. - * - * @return the type value. - */ - @Generated - @Override - public String getType() { - return this.type; - } - /** * Get the senderDisplayName property: The display name of the sender. * @@ -118,28 +77,6 @@ public String getSenderDisplayName() { return this.senderDisplayName; } - /** - * Get the messageId property: The chat message id. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -158,15 +95,15 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); - jsonWriter.writeStringField("type", getType()); - jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("deleteTime", this.deleteTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deleteTime)); return jsonWriter.writeEndObject(); @@ -184,36 +121,36 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String threadId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; + String type = null; + long version = 0L; String transactionId = null; - String threadId = null; - String messageId = null; String senderDisplayName = null; - String type = null; - Long version = null; OffsetDateTime deleteTime = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("senderCommunicationIdentifier".equals(fieldName)) { + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { senderDisplayName = reader.getString(); - } else if ("type".equals(fieldName)) { - type = reader.getString(); - } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); } else if ("deleteTime".equals(fieldName)) { deleteTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); @@ -222,13 +159,10 @@ public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonRea } } AcsChatMessageDeletedInThreadEventData deserializedAcsChatMessageDeletedInThreadEventData - = new AcsChatMessageDeletedInThreadEventData(senderCommunicationIdentifier, composeTime, deleteTime); + = new AcsChatMessageDeletedInThreadEventData(threadId, messageId, senderCommunicationIdentifier, + composeTime, type, version, deleteTime); deserializedAcsChatMessageDeletedInThreadEventData.transactionId = transactionId; - deserializedAcsChatMessageDeletedInThreadEventData.threadId = threadId; - deserializedAcsChatMessageDeletedInThreadEventData.messageId = messageId; deserializedAcsChatMessageDeletedInThreadEventData.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageDeletedInThreadEventData.type = type; - deserializedAcsChatMessageDeletedInThreadEventData.version = version; return deserializedAcsChatMessageDeletedInThreadEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java index b4c0dd139c93..1e1c34a56ea6 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java @@ -24,13 +24,13 @@ public final class AcsChatMessageEditedEventData extends AcsChatMessageEventBase * The body of the chat message */ @Generated - private String messageBody; + private final String messageBody; /* * The chat message metadata */ @Generated - private final Map metadata; + private Map metadata; /* * The time at which the message was edited @@ -38,36 +38,12 @@ public final class AcsChatMessageEditedEventData extends AcsChatMessageEventBase @Generated private final OffsetDateTime editTime; - /* - * The version of the message - */ - @Generated - private Long version; - - /* - * The type of the message - */ - @Generated - private String type; - /* * The display name of the sender */ @Generated private String senderDisplayName; - /* - * The chat message id - */ - @Generated - private String messageId; - - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -78,17 +54,22 @@ public final class AcsChatMessageEditedEventData extends AcsChatMessageEventBase * Creates an instance of AcsChatMessageEditedEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. - * @param metadata the metadata value to set. + * @param type the type value to set. + * @param version the version value to set. + * @param messageBody the messageBody value to set. * @param editTime the editTime value to set. */ @Generated private AcsChatMessageEditedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, - CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, - Map metadata, OffsetDateTime editTime) { - super(recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime); - this.metadata = metadata; + String threadId, String messageId, CommunicationIdentifierModel senderCommunicationIdentifier, + OffsetDateTime composeTime, String type, long version, String messageBody, OffsetDateTime editTime) { + super(recipientCommunicationIdentifier, threadId, messageId, senderCommunicationIdentifier, composeTime, type, + version); + this.messageBody = messageBody; this.editTime = editTime; } @@ -122,28 +103,6 @@ public OffsetDateTime getEditTime() { return this.editTime; } - /** - * Get the version property: The version of the message. - * - * @return the version value. - */ - @Generated - @Override - public Long getVersion() { - return this.version; - } - - /** - * Get the type property: The type of the message. - * - * @return the type value. - */ - @Generated - @Override - public String getType() { - return this.type; - } - /** * Get the senderDisplayName property: The display name of the sender. * @@ -155,28 +114,6 @@ public String getSenderDisplayName() { return this.senderDisplayName; } - /** - * Get the messageId property: The chat message id. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -196,19 +133,19 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); - jsonWriter.writeStringField("type", getType()); - jsonWriter.writeNumberField("version", getVersion()); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + jsonWriter.writeStringField("messageBody", this.messageBody); jsonWriter.writeStringField("editTime", this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); - jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -225,60 +162,57 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatMessageEditedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; + String type = null; + long version = 0L; String transactionId = null; - String threadId = null; - String messageId = null; String senderDisplayName = null; - String type = null; - Long version = null; - Map metadata = null; - OffsetDateTime editTime = null; String messageBody = null; + OffsetDateTime editTime = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { senderDisplayName = reader.getString(); - } else if ("type".equals(fieldName)) { - type = reader.getString(); - } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); + } else if ("messageBody".equals(fieldName)) { + messageBody = reader.getString(); } else if ("editTime".equals(fieldName)) { editTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("messageBody".equals(fieldName)) { - messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } - AcsChatMessageEditedEventData deserializedAcsChatMessageEditedEventData = new AcsChatMessageEditedEventData( - recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime, metadata, editTime); + AcsChatMessageEditedEventData deserializedAcsChatMessageEditedEventData + = new AcsChatMessageEditedEventData(recipientCommunicationIdentifier, threadId, messageId, + senderCommunicationIdentifier, composeTime, type, version, messageBody, editTime); deserializedAcsChatMessageEditedEventData.transactionId = transactionId; - deserializedAcsChatMessageEditedEventData.threadId = threadId; - deserializedAcsChatMessageEditedEventData.messageId = messageId; deserializedAcsChatMessageEditedEventData.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageEditedEventData.type = type; - deserializedAcsChatMessageEditedEventData.version = version; - deserializedAcsChatMessageEditedEventData.messageBody = messageBody; + deserializedAcsChatMessageEditedEventData.metadata = metadata; return deserializedAcsChatMessageEditedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java index 30575e375db6..05d2d3d8a0e3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java @@ -24,13 +24,13 @@ public final class AcsChatMessageEditedInThreadEventData extends AcsChatMessageE * The body of the chat message */ @Generated - private String messageBody; + private final String messageBody; /* * The chat message metadata */ @Generated - private final Map metadata; + private Map metadata; /* * The time at which the message was edited @@ -38,36 +38,12 @@ public final class AcsChatMessageEditedInThreadEventData extends AcsChatMessageE @Generated private final OffsetDateTime editTime; - /* - * The version of the message - */ - @Generated - private Long version; - - /* - * The type of the message - */ - @Generated - private String type; - /* * The display name of the sender */ @Generated private String senderDisplayName; - /* - * The chat message id - */ - @Generated - private String messageId; - - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -77,16 +53,21 @@ public final class AcsChatMessageEditedInThreadEventData extends AcsChatMessageE /** * Creates an instance of AcsChatMessageEditedInThreadEventData class. * + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. - * @param metadata the metadata value to set. + * @param type the type value to set. + * @param version the version value to set. + * @param messageBody the messageBody value to set. * @param editTime the editTime value to set. */ @Generated - private AcsChatMessageEditedInThreadEventData(CommunicationIdentifierModel senderCommunicationIdentifier, - OffsetDateTime composeTime, Map metadata, OffsetDateTime editTime) { - super(senderCommunicationIdentifier, composeTime); - this.metadata = metadata; + private AcsChatMessageEditedInThreadEventData(String threadId, String messageId, + CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, String type, + long version, String messageBody, OffsetDateTime editTime) { + super(threadId, messageId, senderCommunicationIdentifier, composeTime, type, version); + this.messageBody = messageBody; this.editTime = editTime; } @@ -120,28 +101,6 @@ public OffsetDateTime getEditTime() { return this.editTime; } - /** - * Get the version property: The version of the message. - * - * @return the version value. - */ - @Generated - @Override - public Long getVersion() { - return this.version; - } - - /** - * Get the type property: The type of the message. - * - * @return the type value. - */ - @Generated - @Override - public String getType() { - return this.type; - } - /** * Get the senderDisplayName property: The display name of the sender. * @@ -153,28 +112,6 @@ public String getSenderDisplayName() { return this.senderDisplayName; } - /** - * Get the messageId property: The chat message id. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -193,19 +130,19 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); - jsonWriter.writeStringField("type", getType()); - jsonWriter.writeNumberField("version", getVersion()); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + jsonWriter.writeStringField("messageBody", this.messageBody); jsonWriter.writeStringField("editTime", this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); - jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -221,59 +158,55 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatMessageEditedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String threadId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; + String type = null; + long version = 0L; String transactionId = null; - String threadId = null; - String messageId = null; String senderDisplayName = null; - String type = null; - Long version = null; - Map metadata = null; - OffsetDateTime editTime = null; String messageBody = null; + OffsetDateTime editTime = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("senderCommunicationIdentifier".equals(fieldName)) { + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { senderDisplayName = reader.getString(); - } else if ("type".equals(fieldName)) { - type = reader.getString(); - } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); + } else if ("messageBody".equals(fieldName)) { + messageBody = reader.getString(); } else if ("editTime".equals(fieldName)) { editTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("messageBody".equals(fieldName)) { - messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } AcsChatMessageEditedInThreadEventData deserializedAcsChatMessageEditedInThreadEventData - = new AcsChatMessageEditedInThreadEventData(senderCommunicationIdentifier, composeTime, metadata, - editTime); + = new AcsChatMessageEditedInThreadEventData(threadId, messageId, senderCommunicationIdentifier, + composeTime, type, version, messageBody, editTime); deserializedAcsChatMessageEditedInThreadEventData.transactionId = transactionId; - deserializedAcsChatMessageEditedInThreadEventData.threadId = threadId; - deserializedAcsChatMessageEditedInThreadEventData.messageId = messageId; deserializedAcsChatMessageEditedInThreadEventData.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageEditedInThreadEventData.type = type; - deserializedAcsChatMessageEditedInThreadEventData.version = version; - deserializedAcsChatMessageEditedInThreadEventData.messageBody = messageBody; + deserializedAcsChatMessageEditedInThreadEventData.metadata = metadata; return deserializedAcsChatMessageEditedInThreadEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java index 0ef110d10a5d..2559865f2803 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java @@ -23,7 +23,7 @@ public class AcsChatMessageEventBaseProperties extends AcsChatEventBasePropertie * The chat message id */ @Generated - private String messageId; + private final String messageId; /* * The communication identifier of the sender @@ -47,19 +47,13 @@ public class AcsChatMessageEventBaseProperties extends AcsChatEventBasePropertie * The type of the message */ @Generated - private String type; + private final String type; /* * The version of the message */ @Generated - private Long version; - - /* - * The chat thread id - */ - @Generated - private String threadId; + private final long version; /* * The transaction id will be used as co-relation vector @@ -71,15 +65,23 @@ public class AcsChatMessageEventBaseProperties extends AcsChatEventBasePropertie * Creates an instance of AcsChatMessageEventBaseProperties class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. + * @param type the type value to set. + * @param version the version value to set. */ @Generated protected AcsChatMessageEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, - CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime) { - super(recipientCommunicationIdentifier); + String threadId, String messageId, CommunicationIdentifierModel senderCommunicationIdentifier, + OffsetDateTime composeTime, String type, long version) { + super(recipientCommunicationIdentifier, threadId); + this.messageId = messageId; this.senderCommunicationIdentifier = senderCommunicationIdentifier; this.composeTime = composeTime; + this.type = type; + this.version = version; } /** @@ -92,18 +94,6 @@ public String getMessageId() { return this.messageId; } - /** - * Set the messageId property: The chat message id. - * - * @param messageId the messageId value to set. - * @return the AcsChatMessageEventBaseProperties object itself. - */ - @Generated - AcsChatMessageEventBaseProperties setMessageId(String messageId) { - this.messageId = messageId; - return this; - } - /** * Get the senderCommunicationIdentifier property: The communication identifier of the sender. * @@ -156,51 +146,16 @@ public String getType() { return this.type; } - /** - * Set the type property: The type of the message. - * - * @param type the type value to set. - * @return the AcsChatMessageEventBaseProperties object itself. - */ - @Generated - AcsChatMessageEventBaseProperties setType(String type) { - this.type = type; - return this; - } - /** * Get the version property: The version of the message. * * @return the version value. */ @Generated - public Long getVersion() { + public long getVersion() { return this.version; } - /** - * Set the version property: The version of the message. - * - * @param version the version value to set. - * @return the AcsChatMessageEventBaseProperties object itself. - */ - @Generated - AcsChatMessageEventBaseProperties setVersion(Long version) { - this.version = version; - return this; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -220,15 +175,15 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); - jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("transactionId", getTransactionId()); + jsonWriter.writeStringField("messageId", this.messageId); jsonWriter.writeJsonField("senderCommunicationIdentifier", this.senderCommunicationIdentifier); jsonWriter.writeStringField("composeTime", this.composeTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.composeTime)); - jsonWriter.writeStringField("messageId", this.messageId); - jsonWriter.writeStringField("senderDisplayName", this.senderDisplayName); jsonWriter.writeStringField("type", this.type); - jsonWriter.writeNumberField("version", this.version); + jsonWriter.writeLongField("version", this.version); + jsonWriter.writeStringField("senderDisplayName", this.senderDisplayName); return jsonWriter.writeEndObject(); } @@ -245,50 +200,46 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatMessageEventBaseProperties fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; - String transactionId = null; String threadId = null; + String transactionId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; - String messageId = null; - String senderDisplayName = null; String type = null; - Long version = null; + long version = 0L; + String senderDisplayName = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); - } else if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); } else if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); - } else if ("senderDisplayName".equals(fieldName)) { - senderDisplayName = reader.getString(); } else if ("type".equals(fieldName)) { type = reader.getString(); } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); + version = reader.getLong(); + } else if ("senderDisplayName".equals(fieldName)) { + senderDisplayName = reader.getString(); } else { reader.skipChildren(); } } AcsChatMessageEventBaseProperties deserializedAcsChatMessageEventBaseProperties - = new AcsChatMessageEventBaseProperties(recipientCommunicationIdentifier, senderCommunicationIdentifier, - composeTime); + = new AcsChatMessageEventBaseProperties(recipientCommunicationIdentifier, threadId, messageId, + senderCommunicationIdentifier, composeTime, type, version); deserializedAcsChatMessageEventBaseProperties.transactionId = transactionId; - deserializedAcsChatMessageEventBaseProperties.threadId = threadId; - deserializedAcsChatMessageEventBaseProperties.messageId = messageId; deserializedAcsChatMessageEventBaseProperties.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageEventBaseProperties.type = type; - deserializedAcsChatMessageEventBaseProperties.version = version; return deserializedAcsChatMessageEventBaseProperties; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java index 219d5c286f69..d173e8cc17bc 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java @@ -23,7 +23,7 @@ public class AcsChatMessageEventInThreadBaseProperties extends AcsChatEventInThr * The chat message id */ @Generated - private String messageId; + private final String messageId; /* * The communication identifier of the sender @@ -47,19 +47,13 @@ public class AcsChatMessageEventInThreadBaseProperties extends AcsChatEventInThr * The type of the message */ @Generated - private String type; + private final String type; /* * The version of the message */ @Generated - private Long version; - - /* - * The chat thread id - */ - @Generated - private String threadId; + private final long version; /* * The transaction id will be used as co-relation vector @@ -70,14 +64,23 @@ public class AcsChatMessageEventInThreadBaseProperties extends AcsChatEventInThr /** * Creates an instance of AcsChatMessageEventInThreadBaseProperties class. * + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. + * @param type the type value to set. + * @param version the version value to set. */ @Generated - protected AcsChatMessageEventInThreadBaseProperties(CommunicationIdentifierModel senderCommunicationIdentifier, - OffsetDateTime composeTime) { + protected AcsChatMessageEventInThreadBaseProperties(String threadId, String messageId, + CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, String type, + long version) { + super(threadId); + this.messageId = messageId; this.senderCommunicationIdentifier = senderCommunicationIdentifier; this.composeTime = composeTime; + this.type = type; + this.version = version; } /** @@ -90,18 +93,6 @@ public String getMessageId() { return this.messageId; } - /** - * Set the messageId property: The chat message id. - * - * @param messageId the messageId value to set. - * @return the AcsChatMessageEventInThreadBaseProperties object itself. - */ - @Generated - AcsChatMessageEventInThreadBaseProperties setMessageId(String messageId) { - this.messageId = messageId; - return this; - } - /** * Get the senderCommunicationIdentifier property: The communication identifier of the sender. * @@ -154,51 +145,16 @@ public String getType() { return this.type; } - /** - * Set the type property: The type of the message. - * - * @param type the type value to set. - * @return the AcsChatMessageEventInThreadBaseProperties object itself. - */ - @Generated - AcsChatMessageEventInThreadBaseProperties setType(String type) { - this.type = type; - return this; - } - /** * Get the version property: The version of the message. * * @return the version value. */ @Generated - public Long getVersion() { + public long getVersion() { return this.version; } - /** - * Set the version property: The version of the message. - * - * @param version the version value to set. - * @return the AcsChatMessageEventInThreadBaseProperties object itself. - */ - @Generated - AcsChatMessageEventInThreadBaseProperties setVersion(Long version) { - this.version = version; - return this; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -217,15 +173,15 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("transactionId", getTransactionId()); + jsonWriter.writeStringField("messageId", this.messageId); jsonWriter.writeJsonField("senderCommunicationIdentifier", this.senderCommunicationIdentifier); jsonWriter.writeStringField("composeTime", this.composeTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.composeTime)); - jsonWriter.writeStringField("messageId", this.messageId); - jsonWriter.writeStringField("senderDisplayName", this.senderDisplayName); jsonWriter.writeStringField("type", this.type); - jsonWriter.writeNumberField("version", this.version); + jsonWriter.writeLongField("version", this.version); + jsonWriter.writeStringField("senderDisplayName", this.senderDisplayName); return jsonWriter.writeEndObject(); } @@ -241,47 +197,44 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatMessageEventInThreadBaseProperties fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - String transactionId = null; String threadId = null; + String transactionId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; - String messageId = null; - String senderDisplayName = null; String type = null; - Long version = null; + long version = 0L; + String senderDisplayName = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { + if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); - } else if ("senderDisplayName".equals(fieldName)) { - senderDisplayName = reader.getString(); } else if ("type".equals(fieldName)) { type = reader.getString(); } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); + version = reader.getLong(); + } else if ("senderDisplayName".equals(fieldName)) { + senderDisplayName = reader.getString(); } else { reader.skipChildren(); } } AcsChatMessageEventInThreadBaseProperties deserializedAcsChatMessageEventInThreadBaseProperties - = new AcsChatMessageEventInThreadBaseProperties(senderCommunicationIdentifier, composeTime); + = new AcsChatMessageEventInThreadBaseProperties(threadId, messageId, senderCommunicationIdentifier, + composeTime, type, version); deserializedAcsChatMessageEventInThreadBaseProperties.transactionId = transactionId; - deserializedAcsChatMessageEventInThreadBaseProperties.threadId = threadId; - deserializedAcsChatMessageEventInThreadBaseProperties.messageId = messageId; deserializedAcsChatMessageEventInThreadBaseProperties.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageEventInThreadBaseProperties.type = type; - deserializedAcsChatMessageEventInThreadBaseProperties.version = version; return deserializedAcsChatMessageEventInThreadBaseProperties; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java index 3b3ab0e90291..6ee11c674a73 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java @@ -24,25 +24,13 @@ public final class AcsChatMessageReceivedEventData extends AcsChatMessageEventBa * The body of the chat message */ @Generated - private String messageBody; + private final String messageBody; /* * The chat message metadata */ @Generated - private final Map metadata; - - /* - * The version of the message - */ - @Generated - private Long version; - - /* - * The type of the message - */ - @Generated - private String type; + private Map metadata; /* * The display name of the sender @@ -50,18 +38,6 @@ public final class AcsChatMessageReceivedEventData extends AcsChatMessageEventBa @Generated private String senderDisplayName; - /* - * The chat message id - */ - @Generated - private String messageId; - - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -72,16 +48,21 @@ public final class AcsChatMessageReceivedEventData extends AcsChatMessageEventBa * Creates an instance of AcsChatMessageReceivedEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. - * @param metadata the metadata value to set. + * @param type the type value to set. + * @param version the version value to set. + * @param messageBody the messageBody value to set. */ @Generated private AcsChatMessageReceivedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, - CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, - Map metadata) { - super(recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime); - this.metadata = metadata; + String threadId, String messageId, CommunicationIdentifierModel senderCommunicationIdentifier, + OffsetDateTime composeTime, String type, long version, String messageBody) { + super(recipientCommunicationIdentifier, threadId, messageId, senderCommunicationIdentifier, composeTime, type, + version); + this.messageBody = messageBody; } /** @@ -104,28 +85,6 @@ public Map getMetadata() { return this.metadata; } - /** - * Get the version property: The version of the message. - * - * @return the version value. - */ - @Generated - @Override - public Long getVersion() { - return this.version; - } - - /** - * Get the type property: The type of the message. - * - * @return the type value. - */ - @Generated - @Override - public String getType() { - return this.type; - } - /** * Get the senderDisplayName property: The display name of the sender. * @@ -137,28 +96,6 @@ public String getSenderDisplayName() { return this.senderDisplayName; } - /** - * Get the messageId property: The chat message id. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -178,17 +115,17 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); - jsonWriter.writeStringField("type", getType()); - jsonWriter.writeNumberField("version", getVersion()); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -205,57 +142,53 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatMessageReceivedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; + String type = null; + long version = 0L; String transactionId = null; - String threadId = null; - String messageId = null; String senderDisplayName = null; - String type = null; - Long version = null; - Map metadata = null; String messageBody = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { senderDisplayName = reader.getString(); - } else if ("type".equals(fieldName)) { - type = reader.getString(); - } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); } else if ("messageBody".equals(fieldName)) { messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } AcsChatMessageReceivedEventData deserializedAcsChatMessageReceivedEventData - = new AcsChatMessageReceivedEventData(recipientCommunicationIdentifier, senderCommunicationIdentifier, - composeTime, metadata); + = new AcsChatMessageReceivedEventData(recipientCommunicationIdentifier, threadId, messageId, + senderCommunicationIdentifier, composeTime, type, version, messageBody); deserializedAcsChatMessageReceivedEventData.transactionId = transactionId; - deserializedAcsChatMessageReceivedEventData.threadId = threadId; - deserializedAcsChatMessageReceivedEventData.messageId = messageId; deserializedAcsChatMessageReceivedEventData.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageReceivedEventData.type = type; - deserializedAcsChatMessageReceivedEventData.version = version; - deserializedAcsChatMessageReceivedEventData.messageBody = messageBody; + deserializedAcsChatMessageReceivedEventData.metadata = metadata; return deserializedAcsChatMessageReceivedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java index 6f878a5f3dbd..08affcae35a5 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java @@ -24,25 +24,13 @@ public final class AcsChatMessageReceivedInThreadEventData extends AcsChatMessag * The body of the chat message */ @Generated - private String messageBody; + private final String messageBody; /* * The chat message metadata */ @Generated - private final Map metadata; - - /* - * The version of the message - */ - @Generated - private Long version; - - /* - * The type of the message - */ - @Generated - private String type; + private Map metadata; /* * The display name of the sender @@ -50,18 +38,6 @@ public final class AcsChatMessageReceivedInThreadEventData extends AcsChatMessag @Generated private String senderDisplayName; - /* - * The chat message id - */ - @Generated - private String messageId; - - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -71,15 +47,20 @@ public final class AcsChatMessageReceivedInThreadEventData extends AcsChatMessag /** * Creates an instance of AcsChatMessageReceivedInThreadEventData class. * + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. * @param composeTime the composeTime value to set. - * @param metadata the metadata value to set. + * @param type the type value to set. + * @param version the version value to set. + * @param messageBody the messageBody value to set. */ @Generated - private AcsChatMessageReceivedInThreadEventData(CommunicationIdentifierModel senderCommunicationIdentifier, - OffsetDateTime composeTime, Map metadata) { - super(senderCommunicationIdentifier, composeTime); - this.metadata = metadata; + private AcsChatMessageReceivedInThreadEventData(String threadId, String messageId, + CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, String type, + long version, String messageBody) { + super(threadId, messageId, senderCommunicationIdentifier, composeTime, type, version); + this.messageBody = messageBody; } /** @@ -102,28 +83,6 @@ public Map getMetadata() { return this.metadata; } - /** - * Get the version property: The version of the message. - * - * @return the version value. - */ - @Generated - @Override - public Long getVersion() { - return this.version; - } - - /** - * Get the type property: The type of the message. - * - * @return the type value. - */ - @Generated - @Override - public String getType() { - return this.type; - } - /** * Get the senderDisplayName property: The display name of the sender. * @@ -135,28 +94,6 @@ public String getSenderDisplayName() { return this.senderDisplayName; } - /** - * Get the messageId property: The chat message id. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -175,17 +112,17 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); - jsonWriter.writeStringField("type", getType()); - jsonWriter.writeNumberField("version", getVersion()); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -201,54 +138,51 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatMessageReceivedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String threadId = null; + String messageId = null; CommunicationIdentifierModel senderCommunicationIdentifier = null; OffsetDateTime composeTime = null; + String type = null; + long version = 0L; String transactionId = null; - String threadId = null; - String messageId = null; String senderDisplayName = null; - String type = null; - Long version = null; - Map metadata = null; String messageBody = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("senderCommunicationIdentifier".equals(fieldName)) { + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("composeTime".equals(fieldName)) { composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); - } else if ("messageId".equals(fieldName)) { - messageId = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { senderDisplayName = reader.getString(); - } else if ("type".equals(fieldName)) { - type = reader.getString(); - } else if ("version".equals(fieldName)) { - version = reader.getNullable(JsonReader::getLong); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); } else if ("messageBody".equals(fieldName)) { messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } AcsChatMessageReceivedInThreadEventData deserializedAcsChatMessageReceivedInThreadEventData - = new AcsChatMessageReceivedInThreadEventData(senderCommunicationIdentifier, composeTime, metadata); + = new AcsChatMessageReceivedInThreadEventData(threadId, messageId, senderCommunicationIdentifier, + composeTime, type, version, messageBody); deserializedAcsChatMessageReceivedInThreadEventData.transactionId = transactionId; - deserializedAcsChatMessageReceivedInThreadEventData.threadId = threadId; - deserializedAcsChatMessageReceivedInThreadEventData.messageId = messageId; deserializedAcsChatMessageReceivedInThreadEventData.senderDisplayName = senderDisplayName; - deserializedAcsChatMessageReceivedInThreadEventData.type = type; - deserializedAcsChatMessageReceivedInThreadEventData.version = version; - deserializedAcsChatMessageReceivedInThreadEventData.messageBody = messageBody; + deserializedAcsChatMessageReceivedInThreadEventData.metadata = metadata; return deserializedAcsChatMessageReceivedInThreadEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java index 50e9309bdb02..496e2fd4f8cb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java @@ -43,12 +43,6 @@ public final class AcsChatParticipantAddedToThreadEventData extends AcsChatEvent @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -58,14 +52,16 @@ public final class AcsChatParticipantAddedToThreadEventData extends AcsChatEvent /** * Creates an instance of AcsChatParticipantAddedToThreadEventData class. * + * @param threadId the threadId value to set. * @param time the time value to set. * @param addedByCommunicationIdentifier the addedByCommunicationIdentifier value to set. * @param participantAdded the participantAdded value to set. */ @Generated - private AcsChatParticipantAddedToThreadEventData(OffsetDateTime time, + private AcsChatParticipantAddedToThreadEventData(String threadId, OffsetDateTime time, CommunicationIdentifierModel addedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantAdded) { + super(threadId); this.time = time; this.addedByCommunicationIdentifier = addedByCommunicationIdentifier; this.participantAdded = participantAdded; @@ -111,17 +107,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -140,8 +125,8 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("time", this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeJsonField("addedByCommunicationIdentifier", this.addedByCommunicationIdentifier); @@ -162,8 +147,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatParticipantAddedToThreadEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - String transactionId = null; String threadId = null; + String transactionId = null; OffsetDateTime time = null; CommunicationIdentifierModel addedByCommunicationIdentifier = null; AcsChatThreadParticipantProperties participantAdded = null; @@ -172,10 +157,10 @@ public static AcsChatParticipantAddedToThreadEventData fromJson(JsonReader jsonR String fieldName = reader.getFieldName(); reader.nextToken(); - if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { + if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); } else if ("time".equals(fieldName)) { time = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); @@ -190,9 +175,9 @@ public static AcsChatParticipantAddedToThreadEventData fromJson(JsonReader jsonR } } AcsChatParticipantAddedToThreadEventData deserializedAcsChatParticipantAddedToThreadEventData - = new AcsChatParticipantAddedToThreadEventData(time, addedByCommunicationIdentifier, participantAdded); + = new AcsChatParticipantAddedToThreadEventData(threadId, time, addedByCommunicationIdentifier, + participantAdded); deserializedAcsChatParticipantAddedToThreadEventData.transactionId = transactionId; - deserializedAcsChatParticipantAddedToThreadEventData.threadId = threadId; deserializedAcsChatParticipantAddedToThreadEventData.version = version; return deserializedAcsChatParticipantAddedToThreadEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java index 92f51735ec27..e6ee9f5b9716 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java @@ -44,12 +44,6 @@ public final class AcsChatParticipantAddedToThreadWithUserEventData extends AcsC @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -60,6 +54,7 @@ public final class AcsChatParticipantAddedToThreadWithUserEventData extends AcsC * Creates an instance of AcsChatParticipantAddedToThreadWithUserEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param time the time value to set. * @param addedByCommunicationIdentifier the addedByCommunicationIdentifier value to set. @@ -67,10 +62,10 @@ public final class AcsChatParticipantAddedToThreadWithUserEventData extends AcsC */ @Generated private AcsChatParticipantAddedToThreadWithUserEventData( - CommunicationIdentifierModel recipientCommunicationIdentifier, OffsetDateTime createTime, OffsetDateTime time, - CommunicationIdentifierModel addedByCommunicationIdentifier, + CommunicationIdentifierModel recipientCommunicationIdentifier, String threadId, OffsetDateTime createTime, + OffsetDateTime time, CommunicationIdentifierModel addedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantAdded) { - super(recipientCommunicationIdentifier, createTime); + super(recipientCommunicationIdentifier, threadId, createTime); this.time = time; this.addedByCommunicationIdentifier = addedByCommunicationIdentifier; this.participantAdded = participantAdded; @@ -117,17 +112,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -147,10 +131,10 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("time", this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); @@ -172,9 +156,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatParticipantAddedToThreadWithUserEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; OffsetDateTime time = null; CommunicationIdentifierModel addedByCommunicationIdentifier = null; @@ -185,13 +169,13 @@ public static AcsChatParticipantAddedToThreadWithUserEventData fromJson(JsonRead if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("time".equals(fieldName)) { @@ -206,10 +190,9 @@ public static AcsChatParticipantAddedToThreadWithUserEventData fromJson(JsonRead } } AcsChatParticipantAddedToThreadWithUserEventData deserializedAcsChatParticipantAddedToThreadWithUserEventData - = new AcsChatParticipantAddedToThreadWithUserEventData(recipientCommunicationIdentifier, createTime, - time, addedByCommunicationIdentifier, participantAdded); + = new AcsChatParticipantAddedToThreadWithUserEventData(recipientCommunicationIdentifier, threadId, + createTime, time, addedByCommunicationIdentifier, participantAdded); deserializedAcsChatParticipantAddedToThreadWithUserEventData.transactionId = transactionId; - deserializedAcsChatParticipantAddedToThreadWithUserEventData.threadId = threadId; deserializedAcsChatParticipantAddedToThreadWithUserEventData.version = version; return deserializedAcsChatParticipantAddedToThreadWithUserEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java index d986c3d3dc16..066b79479192 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java @@ -43,12 +43,6 @@ public final class AcsChatParticipantRemovedFromThreadEventData extends AcsChatE @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -58,14 +52,16 @@ public final class AcsChatParticipantRemovedFromThreadEventData extends AcsChatE /** * Creates an instance of AcsChatParticipantRemovedFromThreadEventData class. * + * @param threadId the threadId value to set. * @param time the time value to set. * @param removedByCommunicationIdentifier the removedByCommunicationIdentifier value to set. * @param participantRemoved the participantRemoved value to set. */ @Generated - private AcsChatParticipantRemovedFromThreadEventData(OffsetDateTime time, + private AcsChatParticipantRemovedFromThreadEventData(String threadId, OffsetDateTime time, CommunicationIdentifierModel removedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantRemoved) { + super(threadId); this.time = time; this.removedByCommunicationIdentifier = removedByCommunicationIdentifier; this.participantRemoved = participantRemoved; @@ -111,17 +107,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -140,8 +125,8 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("time", this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeJsonField("removedByCommunicationIdentifier", this.removedByCommunicationIdentifier); @@ -162,8 +147,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatParticipantRemovedFromThreadEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - String transactionId = null; String threadId = null; + String transactionId = null; OffsetDateTime time = null; CommunicationIdentifierModel removedByCommunicationIdentifier = null; AcsChatThreadParticipantProperties participantRemoved = null; @@ -172,10 +157,10 @@ public static AcsChatParticipantRemovedFromThreadEventData fromJson(JsonReader j String fieldName = reader.getFieldName(); reader.nextToken(); - if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { + if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); } else if ("time".equals(fieldName)) { time = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); @@ -190,10 +175,9 @@ public static AcsChatParticipantRemovedFromThreadEventData fromJson(JsonReader j } } AcsChatParticipantRemovedFromThreadEventData deserializedAcsChatParticipantRemovedFromThreadEventData - = new AcsChatParticipantRemovedFromThreadEventData(time, removedByCommunicationIdentifier, + = new AcsChatParticipantRemovedFromThreadEventData(threadId, time, removedByCommunicationIdentifier, participantRemoved); deserializedAcsChatParticipantRemovedFromThreadEventData.transactionId = transactionId; - deserializedAcsChatParticipantRemovedFromThreadEventData.threadId = threadId; deserializedAcsChatParticipantRemovedFromThreadEventData.version = version; return deserializedAcsChatParticipantRemovedFromThreadEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java index 8195fdf15ec6..c58460c56f84 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java @@ -44,12 +44,6 @@ public final class AcsChatParticipantRemovedFromThreadWithUserEventData extends @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -60,6 +54,7 @@ public final class AcsChatParticipantRemovedFromThreadWithUserEventData extends * Creates an instance of AcsChatParticipantRemovedFromThreadWithUserEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param time the time value to set. * @param removedByCommunicationIdentifier the removedByCommunicationIdentifier value to set. @@ -67,10 +62,10 @@ public final class AcsChatParticipantRemovedFromThreadWithUserEventData extends */ @Generated private AcsChatParticipantRemovedFromThreadWithUserEventData( - CommunicationIdentifierModel recipientCommunicationIdentifier, OffsetDateTime createTime, OffsetDateTime time, - CommunicationIdentifierModel removedByCommunicationIdentifier, + CommunicationIdentifierModel recipientCommunicationIdentifier, String threadId, OffsetDateTime createTime, + OffsetDateTime time, CommunicationIdentifierModel removedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantRemoved) { - super(recipientCommunicationIdentifier, createTime); + super(recipientCommunicationIdentifier, threadId, createTime); this.time = time; this.removedByCommunicationIdentifier = removedByCommunicationIdentifier; this.participantRemoved = participantRemoved; @@ -117,17 +112,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -147,10 +131,10 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("time", this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); @@ -173,9 +157,9 @@ public static AcsChatParticipantRemovedFromThreadWithUserEventData fromJson(Json throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; OffsetDateTime time = null; CommunicationIdentifierModel removedByCommunicationIdentifier = null; @@ -186,13 +170,13 @@ public static AcsChatParticipantRemovedFromThreadWithUserEventData fromJson(Json if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("time".equals(fieldName)) { @@ -207,10 +191,9 @@ public static AcsChatParticipantRemovedFromThreadWithUserEventData fromJson(Json } } AcsChatParticipantRemovedFromThreadWithUserEventData deserializedAcsChatParticipantRemovedFromThreadWithUserEventData - = new AcsChatParticipantRemovedFromThreadWithUserEventData(recipientCommunicationIdentifier, createTime, - time, removedByCommunicationIdentifier, participantRemoved); + = new AcsChatParticipantRemovedFromThreadWithUserEventData(recipientCommunicationIdentifier, threadId, + createTime, time, removedByCommunicationIdentifier, participantRemoved); deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.transactionId = transactionId; - deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.threadId = threadId; deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.version = version; return deserializedAcsChatParticipantRemovedFromThreadWithUserEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java index 98e28ca5cff5..82b70b422d8b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java @@ -38,13 +38,13 @@ public final class AcsChatThreadCreatedEventData extends AcsChatThreadEventInThr * The thread metadata */ @Generated - private final Map metadata; + private Map metadata; /* * The list of properties of participants who are part of the thread */ @Generated - private final List participants; + private List participants; /* * The version of the thread @@ -52,12 +52,6 @@ public final class AcsChatThreadCreatedEventData extends AcsChatThreadEventInThr @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -67,21 +61,17 @@ public final class AcsChatThreadCreatedEventData extends AcsChatThreadEventInThr /** * Creates an instance of AcsChatThreadCreatedEventData class. * + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param createdByCommunicationIdentifier the createdByCommunicationIdentifier value to set. * @param properties the properties value to set. - * @param metadata the metadata value to set. - * @param participants the participants value to set. */ @Generated - private AcsChatThreadCreatedEventData(OffsetDateTime createTime, - CommunicationIdentifierModel createdByCommunicationIdentifier, Map properties, - Map metadata, List participants) { - super(createTime); + private AcsChatThreadCreatedEventData(String threadId, OffsetDateTime createTime, + CommunicationIdentifierModel createdByCommunicationIdentifier, Map properties) { + super(threadId, createTime); this.createdByCommunicationIdentifier = createdByCommunicationIdentifier; this.properties = properties; - this.metadata = metadata; - this.participants = participants; } /** @@ -136,17 +126,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -165,16 +144,15 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier); jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("participants", this.participants, (writer, element) -> writer.writeJson(element)); return jsonWriter.writeEndObject(); } @@ -190,25 +168,25 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatThreadCreatedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; CommunicationIdentifierModel createdByCommunicationIdentifier = null; Map properties = null; - Map metadata = null; List participants = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("createTime".equals(fieldName)) { + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("createdByCommunicationIdentifier".equals(fieldName)) { @@ -216,19 +194,20 @@ public static AcsChatThreadCreatedEventData fromJson(JsonReader jsonReader) thro } else if ("properties".equals(fieldName)) { properties = reader.readMap(reader1 -> reader1 .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); } else if ("participants".equals(fieldName)) { participants = reader.readArray(reader1 -> AcsChatThreadParticipantProperties.fromJson(reader1)); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } - AcsChatThreadCreatedEventData deserializedAcsChatThreadCreatedEventData = new AcsChatThreadCreatedEventData( - createTime, createdByCommunicationIdentifier, properties, metadata, participants); + AcsChatThreadCreatedEventData deserializedAcsChatThreadCreatedEventData + = new AcsChatThreadCreatedEventData(threadId, createTime, createdByCommunicationIdentifier, properties); deserializedAcsChatThreadCreatedEventData.transactionId = transactionId; - deserializedAcsChatThreadCreatedEventData.threadId = threadId; deserializedAcsChatThreadCreatedEventData.version = version; + deserializedAcsChatThreadCreatedEventData.participants = participants; + deserializedAcsChatThreadCreatedEventData.metadata = metadata; return deserializedAcsChatThreadCreatedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java index 6c5e35e8bb06..76514a28f7cf 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java @@ -38,13 +38,13 @@ public final class AcsChatThreadCreatedWithUserEventData extends AcsChatThreadEv * The thread metadata */ @Generated - private final Map metadata; + private Map metadata; /* * The list of properties of participants who are part of the thread */ @Generated - private final List participants; + private List participants; /* * The version of the thread @@ -52,12 +52,6 @@ public final class AcsChatThreadCreatedWithUserEventData extends AcsChatThreadEv @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -68,22 +62,18 @@ public final class AcsChatThreadCreatedWithUserEventData extends AcsChatThreadEv * Creates an instance of AcsChatThreadCreatedWithUserEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param createdByCommunicationIdentifier the createdByCommunicationIdentifier value to set. * @param properties the properties value to set. - * @param metadata the metadata value to set. - * @param participants the participants value to set. */ @Generated private AcsChatThreadCreatedWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, - OffsetDateTime createTime, CommunicationIdentifierModel createdByCommunicationIdentifier, - Map properties, Map metadata, - List participants) { - super(recipientCommunicationIdentifier, createTime); + String threadId, OffsetDateTime createTime, CommunicationIdentifierModel createdByCommunicationIdentifier, + Map properties) { + super(recipientCommunicationIdentifier, threadId, createTime); this.createdByCommunicationIdentifier = createdByCommunicationIdentifier; this.properties = properties; - this.metadata = metadata; - this.participants = participants; } /** @@ -138,17 +128,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -168,16 +147,15 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier); jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("participants", this.participants, (writer, element) -> writer.writeJson(element)); return jsonWriter.writeEndObject(); } @@ -194,27 +172,27 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatThreadCreatedWithUserEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; CommunicationIdentifierModel createdByCommunicationIdentifier = null; Map properties = null; - Map metadata = null; List participants = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("createdByCommunicationIdentifier".equals(fieldName)) { @@ -222,20 +200,21 @@ public static AcsChatThreadCreatedWithUserEventData fromJson(JsonReader jsonRead } else if ("properties".equals(fieldName)) { properties = reader.readMap(reader1 -> reader1 .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); } else if ("participants".equals(fieldName)) { participants = reader.readArray(reader1 -> AcsChatThreadParticipantProperties.fromJson(reader1)); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } AcsChatThreadCreatedWithUserEventData deserializedAcsChatThreadCreatedWithUserEventData - = new AcsChatThreadCreatedWithUserEventData(recipientCommunicationIdentifier, createTime, - createdByCommunicationIdentifier, properties, metadata, participants); + = new AcsChatThreadCreatedWithUserEventData(recipientCommunicationIdentifier, threadId, createTime, + createdByCommunicationIdentifier, properties); deserializedAcsChatThreadCreatedWithUserEventData.transactionId = transactionId; - deserializedAcsChatThreadCreatedWithUserEventData.threadId = threadId; deserializedAcsChatThreadCreatedWithUserEventData.version = version; + deserializedAcsChatThreadCreatedWithUserEventData.participants = participants; + deserializedAcsChatThreadCreatedWithUserEventData.metadata = metadata; return deserializedAcsChatThreadCreatedWithUserEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java index 51ca29a5d562..e16f97c362e5 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java @@ -37,12 +37,6 @@ public final class AcsChatThreadDeletedEventData extends AcsChatThreadEventInThr @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -52,14 +46,15 @@ public final class AcsChatThreadDeletedEventData extends AcsChatThreadEventInThr /** * Creates an instance of AcsChatThreadDeletedEventData class. * + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param deletedByCommunicationIdentifier the deletedByCommunicationIdentifier value to set. * @param deleteTime the deleteTime value to set. */ @Generated - private AcsChatThreadDeletedEventData(OffsetDateTime createTime, + private AcsChatThreadDeletedEventData(String threadId, OffsetDateTime createTime, CommunicationIdentifierModel deletedByCommunicationIdentifier, OffsetDateTime deleteTime) { - super(createTime); + super(threadId, createTime); this.deletedByCommunicationIdentifier = deletedByCommunicationIdentifier; this.deleteTime = deleteTime; } @@ -96,17 +91,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -125,10 +109,10 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("deletedByCommunicationIdentifier", this.deletedByCommunicationIdentifier); jsonWriter.writeStringField("deleteTime", @@ -148,9 +132,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatThreadDeletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; CommunicationIdentifierModel deletedByCommunicationIdentifier = null; OffsetDateTime deleteTime = null; @@ -158,13 +142,13 @@ public static AcsChatThreadDeletedEventData fromJson(JsonReader jsonReader) thro String fieldName = reader.getFieldName(); reader.nextToken(); - if ("createTime".equals(fieldName)) { + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("deletedByCommunicationIdentifier".equals(fieldName)) { @@ -177,9 +161,8 @@ public static AcsChatThreadDeletedEventData fromJson(JsonReader jsonReader) thro } } AcsChatThreadDeletedEventData deserializedAcsChatThreadDeletedEventData - = new AcsChatThreadDeletedEventData(createTime, deletedByCommunicationIdentifier, deleteTime); + = new AcsChatThreadDeletedEventData(threadId, createTime, deletedByCommunicationIdentifier, deleteTime); deserializedAcsChatThreadDeletedEventData.transactionId = transactionId; - deserializedAcsChatThreadDeletedEventData.threadId = threadId; deserializedAcsChatThreadDeletedEventData.version = version; return deserializedAcsChatThreadDeletedEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventBaseProperties.java index a7271a7e7340..a00baac339d8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventBaseProperties.java @@ -31,12 +31,6 @@ public class AcsChatThreadEventBaseProperties extends AcsChatEventBaseProperties @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -47,12 +41,13 @@ public class AcsChatThreadEventBaseProperties extends AcsChatEventBaseProperties * Creates an instance of AcsChatThreadEventBaseProperties class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. * @param createTime the createTime value to set. */ @Generated protected AcsChatThreadEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, - OffsetDateTime createTime) { - super(recipientCommunicationIdentifier); + String threadId, OffsetDateTime createTime) { + super(recipientCommunicationIdentifier, threadId); this.createTime = createTime; } @@ -88,17 +83,6 @@ AcsChatThreadEventBaseProperties setVersion(Long version) { return this; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -118,8 +102,8 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); - jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("createTime", this.createTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createTime)); jsonWriter.writeNumberField("version", this.version); @@ -139,8 +123,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatThreadEventBaseProperties fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; - String transactionId = null; String threadId = null; + String transactionId = null; OffsetDateTime createTime = null; Long version = null; while (reader.nextToken() != JsonToken.END_OBJECT) { @@ -149,10 +133,10 @@ public static AcsChatThreadEventBaseProperties fromJson(JsonReader jsonReader) t if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); - } else if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); } else if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); @@ -163,9 +147,8 @@ public static AcsChatThreadEventBaseProperties fromJson(JsonReader jsonReader) t } } AcsChatThreadEventBaseProperties deserializedAcsChatThreadEventBaseProperties - = new AcsChatThreadEventBaseProperties(recipientCommunicationIdentifier, createTime); + = new AcsChatThreadEventBaseProperties(recipientCommunicationIdentifier, threadId, createTime); deserializedAcsChatThreadEventBaseProperties.transactionId = transactionId; - deserializedAcsChatThreadEventBaseProperties.threadId = threadId; deserializedAcsChatThreadEventBaseProperties.version = version; return deserializedAcsChatThreadEventBaseProperties; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java index 71d2f3e12bea..d54a663abe46 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java @@ -31,12 +31,6 @@ public class AcsChatThreadEventInThreadBaseProperties extends AcsChatEventInThre @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -46,10 +40,12 @@ public class AcsChatThreadEventInThreadBaseProperties extends AcsChatEventInThre /** * Creates an instance of AcsChatThreadEventInThreadBaseProperties class. * + * @param threadId the threadId value to set. * @param createTime the createTime value to set. */ @Generated - protected AcsChatThreadEventInThreadBaseProperties(OffsetDateTime createTime) { + protected AcsChatThreadEventInThreadBaseProperties(String threadId, OffsetDateTime createTime) { + super(threadId); this.createTime = createTime; } @@ -85,17 +81,6 @@ AcsChatThreadEventInThreadBaseProperties setVersion(Long version) { return this; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -114,8 +99,8 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("createTime", this.createTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createTime)); jsonWriter.writeNumberField("version", this.version); @@ -134,18 +119,18 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatThreadEventInThreadBaseProperties fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - String transactionId = null; String threadId = null; + String transactionId = null; OffsetDateTime createTime = null; Long version = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("transactionId".equals(fieldName)) { - transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { + if ("threadId".equals(fieldName)) { threadId = reader.getString(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); @@ -156,9 +141,8 @@ public static AcsChatThreadEventInThreadBaseProperties fromJson(JsonReader jsonR } } AcsChatThreadEventInThreadBaseProperties deserializedAcsChatThreadEventInThreadBaseProperties - = new AcsChatThreadEventInThreadBaseProperties(createTime); + = new AcsChatThreadEventInThreadBaseProperties(threadId, createTime); deserializedAcsChatThreadEventInThreadBaseProperties.transactionId = transactionId; - deserializedAcsChatThreadEventInThreadBaseProperties.threadId = threadId; deserializedAcsChatThreadEventInThreadBaseProperties.version = version; return deserializedAcsChatThreadEventInThreadBaseProperties; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java index 5e30814bc44b..b4290776cd86 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java @@ -34,19 +34,16 @@ public final class AcsChatThreadParticipantProperties implements JsonSerializabl * The metadata of the user */ @Generated - private final Map metadata; + private Map metadata; /** * Creates an instance of AcsChatThreadParticipantProperties class. * * @param participantCommunicationIdentifier the participantCommunicationIdentifier value to set. - * @param metadata the metadata value to set. */ @Generated - private AcsChatThreadParticipantProperties(CommunicationIdentifierModel participantCommunicationIdentifier, - Map metadata) { + private AcsChatThreadParticipantProperties(CommunicationIdentifierModel participantCommunicationIdentifier) { this.participantCommunicationIdentifier = participantCommunicationIdentifier; - this.metadata = metadata; } /** @@ -87,8 +84,8 @@ public Map getMetadata() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("participantCommunicationIdentifier", this.participantCommunicationIdentifier); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("displayName", this.displayName); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -105,25 +102,26 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatThreadParticipantProperties fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel participantCommunicationIdentifier = null; - Map metadata = null; String displayName = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("participantCommunicationIdentifier".equals(fieldName)) { participantCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); } else if ("displayName".equals(fieldName)) { displayName = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } AcsChatThreadParticipantProperties deserializedAcsChatThreadParticipantProperties - = new AcsChatThreadParticipantProperties(participantCommunicationIdentifier, metadata); + = new AcsChatThreadParticipantProperties(participantCommunicationIdentifier); deserializedAcsChatThreadParticipantProperties.displayName = displayName; + deserializedAcsChatThreadParticipantProperties.metadata = metadata; return deserializedAcsChatThreadParticipantProperties; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java index 2cdee9fcf0ca..83a87bbdbc2c 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java @@ -51,12 +51,6 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -66,6 +60,7 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread /** * Creates an instance of AcsChatThreadPropertiesUpdatedEventData class. * + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param editedByCommunicationIdentifier the editedByCommunicationIdentifier value to set. * @param editTime the editTime value to set. @@ -73,10 +68,10 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread * @param metadata the metadata value to set. */ @Generated - private AcsChatThreadPropertiesUpdatedEventData(OffsetDateTime createTime, + private AcsChatThreadPropertiesUpdatedEventData(String threadId, OffsetDateTime createTime, CommunicationIdentifierModel editedByCommunicationIdentifier, OffsetDateTime editTime, Map properties, Map metadata) { - super(createTime); + super(threadId, createTime); this.editedByCommunicationIdentifier = editedByCommunicationIdentifier; this.editTime = editTime; this.properties = properties; @@ -135,17 +130,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -164,10 +148,10 @@ public String getTransactionId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier); jsonWriter.writeStringField("editTime", @@ -190,9 +174,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; CommunicationIdentifierModel editedByCommunicationIdentifier = null; OffsetDateTime editTime = null; @@ -202,13 +186,13 @@ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonRe String fieldName = reader.getFieldName(); reader.nextToken(); - if ("createTime".equals(fieldName)) { + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("editedByCommunicationIdentifier".equals(fieldName)) { @@ -226,10 +210,9 @@ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonRe } } AcsChatThreadPropertiesUpdatedEventData deserializedAcsChatThreadPropertiesUpdatedEventData - = new AcsChatThreadPropertiesUpdatedEventData(createTime, editedByCommunicationIdentifier, editTime, - properties, metadata); + = new AcsChatThreadPropertiesUpdatedEventData(threadId, createTime, editedByCommunicationIdentifier, + editTime, properties, metadata); deserializedAcsChatThreadPropertiesUpdatedEventData.transactionId = transactionId; - deserializedAcsChatThreadPropertiesUpdatedEventData.threadId = threadId; deserializedAcsChatThreadPropertiesUpdatedEventData.version = version; return deserializedAcsChatThreadPropertiesUpdatedEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java index fc58f728e639..835c737349c4 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java @@ -38,7 +38,7 @@ public final class AcsChatThreadPropertiesUpdatedPerUserEventData extends AcsCha * The thread metadata */ @Generated - private final Map metadata; + private Map metadata; /* * The updated thread properties @@ -52,12 +52,6 @@ public final class AcsChatThreadPropertiesUpdatedPerUserEventData extends AcsCha @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -68,21 +62,20 @@ public final class AcsChatThreadPropertiesUpdatedPerUserEventData extends AcsCha * Creates an instance of AcsChatThreadPropertiesUpdatedPerUserEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param editedByCommunicationIdentifier the editedByCommunicationIdentifier value to set. * @param editTime the editTime value to set. - * @param metadata the metadata value to set. * @param properties the properties value to set. */ @Generated private AcsChatThreadPropertiesUpdatedPerUserEventData( - CommunicationIdentifierModel recipientCommunicationIdentifier, OffsetDateTime createTime, + CommunicationIdentifierModel recipientCommunicationIdentifier, String threadId, OffsetDateTime createTime, CommunicationIdentifierModel editedByCommunicationIdentifier, OffsetDateTime editTime, - Map metadata, Map properties) { - super(recipientCommunicationIdentifier, createTime); + Map properties) { + super(recipientCommunicationIdentifier, threadId, createTime); this.editedByCommunicationIdentifier = editedByCommunicationIdentifier; this.editTime = editTime; - this.metadata = metadata; this.properties = properties; } @@ -138,17 +131,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -168,17 +150,17 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier); jsonWriter.writeStringField("editTime", this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -195,27 +177,27 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatThreadPropertiesUpdatedPerUserEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; CommunicationIdentifierModel editedByCommunicationIdentifier = null; OffsetDateTime editTime = null; - Map metadata = null; Map properties = null; + Map metadata = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("editedByCommunicationIdentifier".equals(fieldName)) { @@ -223,21 +205,21 @@ public static AcsChatThreadPropertiesUpdatedPerUserEventData fromJson(JsonReader } else if ("editTime".equals(fieldName)) { editTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("metadata".equals(fieldName)) { - metadata = reader.readMap(reader1 -> reader1.getString()); } else if ("properties".equals(fieldName)) { properties = reader.readMap(reader1 -> reader1 .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); } else { reader.skipChildren(); } } AcsChatThreadPropertiesUpdatedPerUserEventData deserializedAcsChatThreadPropertiesUpdatedPerUserEventData - = new AcsChatThreadPropertiesUpdatedPerUserEventData(recipientCommunicationIdentifier, createTime, - editedByCommunicationIdentifier, editTime, metadata, properties); + = new AcsChatThreadPropertiesUpdatedPerUserEventData(recipientCommunicationIdentifier, threadId, + createTime, editedByCommunicationIdentifier, editTime, properties); deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.transactionId = transactionId; - deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.threadId = threadId; deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.version = version; + deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.metadata = metadata; return deserializedAcsChatThreadPropertiesUpdatedPerUserEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java index f7fc914a5427..e05c7560d5ef 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java @@ -37,12 +37,6 @@ public final class AcsChatThreadWithUserDeletedEventData extends AcsChatThreadEv @Generated private Long version; - /* - * The chat thread id - */ - @Generated - private String threadId; - /* * The transaction id will be used as co-relation vector */ @@ -53,15 +47,16 @@ public final class AcsChatThreadWithUserDeletedEventData extends AcsChatThreadEv * Creates an instance of AcsChatThreadWithUserDeletedEventData class. * * @param recipientCommunicationIdentifier the recipientCommunicationIdentifier value to set. + * @param threadId the threadId value to set. * @param createTime the createTime value to set. * @param deletedByCommunicationIdentifier the deletedByCommunicationIdentifier value to set. * @param deleteTime the deleteTime value to set. */ @Generated private AcsChatThreadWithUserDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, - OffsetDateTime createTime, CommunicationIdentifierModel deletedByCommunicationIdentifier, + String threadId, OffsetDateTime createTime, CommunicationIdentifierModel deletedByCommunicationIdentifier, OffsetDateTime deleteTime) { - super(recipientCommunicationIdentifier, createTime); + super(recipientCommunicationIdentifier, threadId, createTime); this.deletedByCommunicationIdentifier = deletedByCommunicationIdentifier; this.deleteTime = deleteTime; } @@ -98,17 +93,6 @@ public Long getVersion() { return this.version; } - /** - * Get the threadId property: The chat thread id. - * - * @return the threadId value. - */ - @Generated - @Override - public String getThreadId() { - return this.threadId; - } - /** * Get the transactionId property: The transaction id will be used as co-relation vector. * @@ -128,10 +112,10 @@ public String getTransactionId() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); + jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeStringField("transactionId", getTransactionId()); - jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("deletedByCommunicationIdentifier", this.deletedByCommunicationIdentifier); jsonWriter.writeStringField("deleteTime", @@ -152,9 +136,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static AcsChatThreadWithUserDeletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { CommunicationIdentifierModel recipientCommunicationIdentifier = null; + String threadId = null; OffsetDateTime createTime = null; String transactionId = null; - String threadId = null; Long version = null; CommunicationIdentifierModel deletedByCommunicationIdentifier = null; OffsetDateTime deleteTime = null; @@ -164,13 +148,13 @@ public static AcsChatThreadWithUserDeletedEventData fromJson(JsonReader jsonRead if ("recipientCommunicationIdentifier".equals(fieldName)) { recipientCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("threadId".equals(fieldName)) { + threadId = reader.getString(); } else if ("createTime".equals(fieldName)) { createTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("transactionId".equals(fieldName)) { transactionId = reader.getString(); - } else if ("threadId".equals(fieldName)) { - threadId = reader.getString(); } else if ("version".equals(fieldName)) { version = reader.getNullable(JsonReader::getLong); } else if ("deletedByCommunicationIdentifier".equals(fieldName)) { @@ -183,10 +167,9 @@ public static AcsChatThreadWithUserDeletedEventData fromJson(JsonReader jsonRead } } AcsChatThreadWithUserDeletedEventData deserializedAcsChatThreadWithUserDeletedEventData - = new AcsChatThreadWithUserDeletedEventData(recipientCommunicationIdentifier, createTime, + = new AcsChatThreadWithUserDeletedEventData(recipientCommunicationIdentifier, threadId, createTime, deletedByCommunicationIdentifier, deleteTime); deserializedAcsChatThreadWithUserDeletedEventData.transactionId = transactionId; - deserializedAcsChatThreadWithUserDeletedEventData.threadId = threadId; deserializedAcsChatThreadWithUserDeletedEventData.version = version; return deserializedAcsChatThreadWithUserDeletedEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java new file mode 100644 index 000000000000..844ef261f5a3 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java @@ -0,0 +1,191 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatTypingIndicatorReceivedInThread + * event. + */ +@Immutable +public final class AcsChatTypingIndicatorReceivedInThreadEventData extends AcsChatMessageEventInThreadBaseProperties { + /* + * The body of the chat message + */ + @Generated + private final String messageBody; + + /* + * The chat message metadata + */ + @Generated + private Map metadata; + + /* + * The display name of the sender + */ + @Generated + private String senderDisplayName; + + /* + * The transaction id will be used as co-relation vector + */ + @Generated + private String transactionId; + + /** + * Creates an instance of AcsChatTypingIndicatorReceivedInThreadEventData class. + * + * @param threadId the threadId value to set. + * @param messageId the messageId value to set. + * @param senderCommunicationIdentifier the senderCommunicationIdentifier value to set. + * @param composeTime the composeTime value to set. + * @param type the type value to set. + * @param version the version value to set. + * @param messageBody the messageBody value to set. + */ + @Generated + private AcsChatTypingIndicatorReceivedInThreadEventData(String threadId, String messageId, + CommunicationIdentifierModel senderCommunicationIdentifier, OffsetDateTime composeTime, String type, + long version, String messageBody) { + super(threadId, messageId, senderCommunicationIdentifier, composeTime, type, version); + this.messageBody = messageBody; + } + + /** + * Get the messageBody property: The body of the chat message. + * + * @return the messageBody value. + */ + @Generated + public String getMessageBody() { + return this.messageBody; + } + + /** + * Get the metadata property: The chat message metadata. + * + * @return the metadata value. + */ + @Generated + public Map getMetadata() { + return this.metadata; + } + + /** + * Get the senderDisplayName property: The display name of the sender. + * + * @return the senderDisplayName value. + */ + @Generated + @Override + public String getSenderDisplayName() { + return this.senderDisplayName; + } + + /** + * Get the transactionId property: The transaction id will be used as co-relation vector. + * + * @return the transactionId value. + */ + @Generated + @Override + public String getTransactionId() { + return this.transactionId; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("composeTime", + getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeLongField("version", getVersion()); + jsonWriter.writeStringField("transactionId", getTransactionId()); + jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); + jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsChatTypingIndicatorReceivedInThreadEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsChatTypingIndicatorReceivedInThreadEventData if the JsonReader was pointing to an + * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsChatTypingIndicatorReceivedInThreadEventData. + */ + @Generated + public static AcsChatTypingIndicatorReceivedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String threadId = null; + String messageId = null; + CommunicationIdentifierModel senderCommunicationIdentifier = null; + OffsetDateTime composeTime = null; + String type = null; + long version = 0L; + String transactionId = null; + String senderDisplayName = null; + String messageBody = null; + Map metadata = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("threadId".equals(fieldName)) { + threadId = reader.getString(); + } else if ("messageId".equals(fieldName)) { + messageId = reader.getString(); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("composeTime".equals(fieldName)) { + composeTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("type".equals(fieldName)) { + type = reader.getString(); + } else if ("version".equals(fieldName)) { + version = reader.getLong(); + } else if ("transactionId".equals(fieldName)) { + transactionId = reader.getString(); + } else if ("senderDisplayName".equals(fieldName)) { + senderDisplayName = reader.getString(); + } else if ("messageBody".equals(fieldName)) { + messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + metadata = reader.readMap(reader1 -> reader1.getString()); + } else { + reader.skipChildren(); + } + } + AcsChatTypingIndicatorReceivedInThreadEventData deserializedAcsChatTypingIndicatorReceivedInThreadEventData + = new AcsChatTypingIndicatorReceivedInThreadEventData(threadId, messageId, + senderCommunicationIdentifier, composeTime, type, version, messageBody); + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.transactionId = transactionId; + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.senderDisplayName = senderDisplayName; + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.metadata = metadata; + + return deserializedAcsChatTypingIndicatorReceivedInThreadEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingStorageInfoProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingStorageInfoProperties.java index aa00a3fd49ae..872646d5a028 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingStorageInfoProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingStorageInfoProperties.java @@ -22,16 +22,13 @@ public final class AcsRecordingStorageInfoProperties implements JsonSerializable * List of details of recording chunks information */ @Generated - private final List recordingChunks; + private List recordingChunks; /** * Creates an instance of AcsRecordingStorageInfoProperties class. - * - * @param recordingChunks the recordingChunks value to set. */ @Generated - private AcsRecordingStorageInfoProperties(List recordingChunks) { - this.recordingChunks = recordingChunks; + private AcsRecordingStorageInfoProperties() { } /** @@ -51,8 +48,6 @@ public List getRecordingChunks() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("recordingChunks", this.recordingChunks, - (writer, element) -> writer.writeJson(element)); return jsonWriter.writeEndObject(); } @@ -68,18 +63,22 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRecordingStorageInfoProperties fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List recordingChunks = null; + AcsRecordingStorageInfoProperties deserializedAcsRecordingStorageInfoProperties + = new AcsRecordingStorageInfoProperties(); while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("recordingChunks".equals(fieldName)) { - recordingChunks = reader.readArray(reader1 -> AcsRecordingChunkInfoProperties.fromJson(reader1)); + List recordingChunks + = reader.readArray(reader1 -> AcsRecordingChunkInfoProperties.fromJson(reader1)); + deserializedAcsRecordingStorageInfoProperties.recordingChunks = recordingChunks; } else { reader.skipChildren(); } } - return new AcsRecordingStorageInfoProperties(recordingChunks); + + return deserializedAcsRecordingStorageInfoProperties; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterEventData.java index 5f6a1420b141..2c91009ecc7d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterEventData.java @@ -21,7 +21,7 @@ public class AcsRouterEventData implements JsonSerializable * Router Event Job ID */ @Generated - private String jobId; + private final String jobId; /* * Router Event Channel Reference @@ -37,9 +37,12 @@ public class AcsRouterEventData implements JsonSerializable /** * Creates an instance of AcsRouterEventData class. + * + * @param jobId the jobId value to set. */ @Generated - protected AcsRouterEventData() { + protected AcsRouterEventData(String jobId) { + this.jobId = jobId; } /** @@ -52,18 +55,6 @@ public String getJobId() { return this.jobId; } - /** - * Set the jobId property: Router Event Job ID. - * - * @param jobId the jobId value to set. - * @return the AcsRouterEventData object itself. - */ - @Generated - AcsRouterEventData setJobId(String jobId) { - this.jobId = jobId; - return this; - } - /** * Get the channelReference property: Router Event Channel Reference. * @@ -127,26 +118,32 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterEventData if the JsonReader was pointing to an instance of it, or null if it was * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterEventData. */ @Generated public static AcsRouterEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AcsRouterEventData deserializedAcsRouterEventData = new AcsRouterEventData(); + String jobId = null; + String channelReference = null; + String channelId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("jobId".equals(fieldName)) { - deserializedAcsRouterEventData.jobId = reader.getString(); + jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { - deserializedAcsRouterEventData.channelReference = reader.getString(); + channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { - deserializedAcsRouterEventData.channelId = reader.getString(); + channelId = reader.getString(); } else { reader.skipChildren(); } } + AcsRouterEventData deserializedAcsRouterEventData = new AcsRouterEventData(jobId); + deserializedAcsRouterEventData.channelReference = channelReference; + deserializedAcsRouterEventData.channelId = channelId; return deserializedAcsRouterEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java index 91374c749f0a..086e36c40b18 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java @@ -47,21 +47,16 @@ public final class AcsRouterJobCancelledEventData extends AcsRouterJobEventData @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobCancelledEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterJobCancelledEventData(Map labels, Map tags) { - super(labels, tags); + private AcsRouterJobCancelledEventData(String jobId, Map labels, Map tags) { + super(jobId, labels, tags); } /** @@ -117,17 +112,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -135,9 +119,9 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -158,9 +142,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -170,12 +154,12 @@ public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) thr String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -191,8 +175,7 @@ public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) thr } } AcsRouterJobCancelledEventData deserializedAcsRouterJobCancelledEventData - = new AcsRouterJobCancelledEventData(labels, tags); - deserializedAcsRouterJobCancelledEventData.jobId = jobId; + = new AcsRouterJobCancelledEventData(jobId, labels, tags); deserializedAcsRouterJobCancelledEventData.channelReference = channelReference; deserializedAcsRouterJobCancelledEventData.channelId = channelId; deserializedAcsRouterJobCancelledEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java index d762e3d7f84e..dd238b62de69 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java @@ -31,7 +31,7 @@ public final class AcsRouterJobClassificationFailedEventData extends AcsRouterJo * Router Job Classification Failed Errors */ @Generated - private final List errors; + private List errors; /* * Router Job events Queue Id @@ -51,24 +51,17 @@ public final class AcsRouterJobClassificationFailedEventData extends AcsRouterJo @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobClassificationFailedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. - * @param errors the errors value to set. */ @Generated - private AcsRouterJobClassificationFailedEventData(Map labels, Map tags, - List errors) { - super(labels, tags); - this.errors = errors; + private AcsRouterJobClassificationFailedEventData(String jobId, Map labels, + Map tags) { + super(jobId, labels, tags); } /** @@ -126,17 +119,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -144,13 +126,12 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeArrayField("errors", this.errors, (writer, element) -> writer.writeJson(element)); jsonWriter.writeStringField("classificationPolicyId", this.classificationPolicyId); return jsonWriter.writeEndObject(); } @@ -167,9 +148,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -178,12 +159,12 @@ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader json while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -199,11 +180,11 @@ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader json } } AcsRouterJobClassificationFailedEventData deserializedAcsRouterJobClassificationFailedEventData - = new AcsRouterJobClassificationFailedEventData(labels, tags, errors); - deserializedAcsRouterJobClassificationFailedEventData.jobId = jobId; + = new AcsRouterJobClassificationFailedEventData(jobId, labels, tags); deserializedAcsRouterJobClassificationFailedEventData.channelReference = channelReference; deserializedAcsRouterJobClassificationFailedEventData.channelId = channelId; deserializedAcsRouterJobClassificationFailedEventData.queueId = queueId; + deserializedAcsRouterJobClassificationFailedEventData.errors = errors; deserializedAcsRouterJobClassificationFailedEventData.classificationPolicyId = classificationPolicyId; return deserializedAcsRouterJobClassificationFailedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java index 92d7e3a0cf69..b9022ae07e70 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java @@ -40,7 +40,7 @@ public final class AcsRouterJobClassifiedEventData extends AcsRouterJobEventData * Router Job Attached Worker Selector */ @Generated - private final List attachedWorkerSelectors; + private List attachedWorkerSelectors; /* * Router Job events Queue Id @@ -60,26 +60,19 @@ public final class AcsRouterJobClassifiedEventData extends AcsRouterJobEventData @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobClassifiedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. * @param queueDetails the queueDetails value to set. - * @param attachedWorkerSelectors the attachedWorkerSelectors value to set. */ @Generated - private AcsRouterJobClassifiedEventData(Map labels, Map tags, - AcsRouterQueueDetails queueDetails, List attachedWorkerSelectors) { - super(labels, tags); + private AcsRouterJobClassifiedEventData(String jobId, Map labels, Map tags, + AcsRouterQueueDetails queueDetails) { + super(jobId, labels, tags); this.queueDetails = queueDetails; - this.attachedWorkerSelectors = attachedWorkerSelectors; } /** @@ -155,17 +148,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -173,15 +155,13 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); jsonWriter.writeJsonField("queueDetails", this.queueDetails); - jsonWriter.writeArrayField("attachedWorkerSelectors", this.attachedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); jsonWriter.writeStringField("classificationPolicyId", this.classificationPolicyId); jsonWriter.writeNumberField("priority", this.priority); return jsonWriter.writeEndObject(); @@ -199,9 +179,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -213,12 +193,12 @@ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) th String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -238,11 +218,11 @@ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) th } } AcsRouterJobClassifiedEventData deserializedAcsRouterJobClassifiedEventData - = new AcsRouterJobClassifiedEventData(labels, tags, queueDetails, attachedWorkerSelectors); - deserializedAcsRouterJobClassifiedEventData.jobId = jobId; + = new AcsRouterJobClassifiedEventData(jobId, labels, tags, queueDetails); deserializedAcsRouterJobClassifiedEventData.channelReference = channelReference; deserializedAcsRouterJobClassifiedEventData.channelId = channelId; deserializedAcsRouterJobClassifiedEventData.queueId = queueId; + deserializedAcsRouterJobClassifiedEventData.attachedWorkerSelectors = attachedWorkerSelectors; deserializedAcsRouterJobClassifiedEventData.classificationPolicyId = classificationPolicyId; deserializedAcsRouterJobClassifiedEventData.priority = priority; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java index 17bae397c85e..34a0608aac95 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java @@ -53,21 +53,16 @@ public final class AcsRouterJobClosedEventData extends AcsRouterJobEventData { @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobClosedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterJobClosedEventData(Map labels, Map tags) { - super(labels, tags); + private AcsRouterJobClosedEventData(String jobId, Map labels, Map tags) { + super(jobId, labels, tags); } /** @@ -133,17 +128,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -151,9 +135,9 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -175,9 +159,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -188,12 +172,12 @@ public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -211,8 +195,7 @@ public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws } } AcsRouterJobClosedEventData deserializedAcsRouterJobClosedEventData - = new AcsRouterJobClosedEventData(labels, tags); - deserializedAcsRouterJobClosedEventData.jobId = jobId; + = new AcsRouterJobClosedEventData(jobId, labels, tags); deserializedAcsRouterJobClosedEventData.channelReference = channelReference; deserializedAcsRouterJobClosedEventData.channelId = channelId; deserializedAcsRouterJobClosedEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java index 77319a2b1c27..9ddac254779f 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java @@ -47,21 +47,16 @@ public final class AcsRouterJobCompletedEventData extends AcsRouterJobEventData @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobCompletedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterJobCompletedEventData(Map labels, Map tags) { - super(labels, tags); + private AcsRouterJobCompletedEventData(String jobId, Map labels, Map tags) { + super(jobId, labels, tags); } /** @@ -117,17 +112,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -135,9 +119,9 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -158,9 +142,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -170,12 +154,12 @@ public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) thr String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -191,8 +175,7 @@ public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) thr } } AcsRouterJobCompletedEventData deserializedAcsRouterJobCompletedEventData - = new AcsRouterJobCompletedEventData(labels, tags); - deserializedAcsRouterJobCompletedEventData.jobId = jobId; + = new AcsRouterJobCompletedEventData(jobId, labels, tags); deserializedAcsRouterJobCompletedEventData.channelReference = channelReference; deserializedAcsRouterJobCompletedEventData.channelId = channelId; deserializedAcsRouterJobCompletedEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java index 37923cfcd8b9..5e16b4b45a61 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java @@ -35,21 +35,16 @@ public final class AcsRouterJobDeletedEventData extends AcsRouterJobEventData { @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobDeletedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterJobDeletedEventData(Map labels, Map tags) { - super(labels, tags); + private AcsRouterJobDeletedEventData(String jobId, Map labels, Map tags) { + super(jobId, labels, tags); } /** @@ -85,17 +80,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -103,9 +87,9 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -124,9 +108,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -134,12 +118,12 @@ public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throw String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -151,8 +135,7 @@ public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throw } } AcsRouterJobDeletedEventData deserializedAcsRouterJobDeletedEventData - = new AcsRouterJobDeletedEventData(labels, tags); - deserializedAcsRouterJobDeletedEventData.jobId = jobId; + = new AcsRouterJobDeletedEventData(jobId, labels, tags); deserializedAcsRouterJobDeletedEventData.channelReference = channelReference; deserializedAcsRouterJobDeletedEventData.channelId = channelId; deserializedAcsRouterJobDeletedEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java index 6952a3112f23..b5be98e73d8a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java @@ -47,20 +47,16 @@ public class AcsRouterJobEventData extends AcsRouterEventData { @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - protected AcsRouterJobEventData(Map labels, Map tags) { + protected AcsRouterJobEventData(String jobId, Map labels, Map tags) { + super(jobId); this.labels = labels; this.tags = tags; } @@ -129,17 +125,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -194,8 +179,7 @@ public static AcsRouterJobEventData fromJson(JsonReader jsonReader) throws IOExc reader.skipChildren(); } } - AcsRouterJobEventData deserializedAcsRouterJobEventData = new AcsRouterJobEventData(labels, tags); - deserializedAcsRouterJobEventData.jobId = jobId; + AcsRouterJobEventData deserializedAcsRouterJobEventData = new AcsRouterJobEventData(jobId, labels, tags); deserializedAcsRouterJobEventData.channelReference = channelReference; deserializedAcsRouterJobEventData.channelId = channelId; deserializedAcsRouterJobEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java index 2138b1fee550..cb295e68b457 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java @@ -47,21 +47,17 @@ public final class AcsRouterJobExceptionTriggeredEventData extends AcsRouterJobE @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobExceptionTriggeredEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterJobExceptionTriggeredEventData(Map labels, Map tags) { - super(labels, tags); + private AcsRouterJobExceptionTriggeredEventData(String jobId, Map labels, + Map tags) { + super(jobId, labels, tags); } /** @@ -117,17 +113,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -135,9 +120,9 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -158,9 +143,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -170,12 +155,12 @@ public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonRe String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -191,8 +176,7 @@ public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonRe } } AcsRouterJobExceptionTriggeredEventData deserializedAcsRouterJobExceptionTriggeredEventData - = new AcsRouterJobExceptionTriggeredEventData(labels, tags); - deserializedAcsRouterJobExceptionTriggeredEventData.jobId = jobId; + = new AcsRouterJobExceptionTriggeredEventData(jobId, labels, tags); deserializedAcsRouterJobExceptionTriggeredEventData.channelReference = channelReference; deserializedAcsRouterJobExceptionTriggeredEventData.channelId = channelId; deserializedAcsRouterJobExceptionTriggeredEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java index 67a1a47194c1..6492f682a28a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java @@ -22,19 +22,19 @@ public final class AcsRouterJobQueuedEventData extends AcsRouterJobEventData { * Router Job Priority */ @Generated - private Integer priority; + private final int priority; /* * Router Job Queued Attached Worker Selector */ @Generated - private final List attachedWorkerSelectors; + private List attachedWorkerSelectors; /* * Router Job Queued Requested Worker Selector */ @Generated - private final List requestedWorkerSelectors; + private List requestedWorkerSelectors; /* * Router Job events Queue Id @@ -54,26 +54,19 @@ public final class AcsRouterJobQueuedEventData extends AcsRouterJobEventData { @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobQueuedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. - * @param attachedWorkerSelectors the attachedWorkerSelectors value to set. - * @param requestedWorkerSelectors the requestedWorkerSelectors value to set. + * @param priority the priority value to set. */ @Generated - private AcsRouterJobQueuedEventData(Map labels, Map tags, - List attachedWorkerSelectors, List requestedWorkerSelectors) { - super(labels, tags); - this.attachedWorkerSelectors = attachedWorkerSelectors; - this.requestedWorkerSelectors = requestedWorkerSelectors; + private AcsRouterJobQueuedEventData(String jobId, Map labels, Map tags, + int priority) { + super(jobId, labels, tags); + this.priority = priority; } /** @@ -82,7 +75,7 @@ private AcsRouterJobQueuedEventData(Map labels, Map writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeArrayField("attachedWorkerSelectors", this.attachedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("requestedWorkerSelectors", this.requestedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeNumberField("priority", this.priority); + jsonWriter.writeIntField("priority", this.priority); return jsonWriter.writeEndObject(); } @@ -183,48 +161,48 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobQueuedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; + int priority = 0; List attachedWorkerSelectors = null; List requestedWorkerSelectors = null; - Integer priority = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { channelId = reader.getString(); } else if ("queueId".equals(fieldName)) { queueId = reader.getString(); + } else if ("priority".equals(fieldName)) { + priority = reader.getInt(); } else if ("attachedWorkerSelectors".equals(fieldName)) { attachedWorkerSelectors = reader.readArray(reader1 -> AcsRouterWorkerSelector.fromJson(reader1)); } else if ("requestedWorkerSelectors".equals(fieldName)) { requestedWorkerSelectors = reader.readArray(reader1 -> AcsRouterWorkerSelector.fromJson(reader1)); - } else if ("priority".equals(fieldName)) { - priority = reader.getNullable(JsonReader::getInt); } else { reader.skipChildren(); } } AcsRouterJobQueuedEventData deserializedAcsRouterJobQueuedEventData - = new AcsRouterJobQueuedEventData(labels, tags, attachedWorkerSelectors, requestedWorkerSelectors); - deserializedAcsRouterJobQueuedEventData.jobId = jobId; + = new AcsRouterJobQueuedEventData(jobId, labels, tags, priority); deserializedAcsRouterJobQueuedEventData.channelReference = channelReference; deserializedAcsRouterJobQueuedEventData.channelId = channelId; deserializedAcsRouterJobQueuedEventData.queueId = queueId; - deserializedAcsRouterJobQueuedEventData.priority = priority; + deserializedAcsRouterJobQueuedEventData.attachedWorkerSelectors = attachedWorkerSelectors; + deserializedAcsRouterJobQueuedEventData.requestedWorkerSelectors = requestedWorkerSelectors; return deserializedAcsRouterJobQueuedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java index 767d777029b5..3406b442f599 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java @@ -43,7 +43,7 @@ public final class AcsRouterJobReceivedEventData extends AcsRouterJobEventData { * Router Job Received Requested Worker Selectors */ @Generated - private final List requestedWorkerSelectors; + private List requestedWorkerSelectors; /* * Router Job Received Scheduled Time in UTC @@ -75,29 +75,21 @@ public final class AcsRouterJobReceivedEventData extends AcsRouterJobEventData { @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobReceivedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. * @param jobStatus the jobStatus value to set. - * @param requestedWorkerSelectors the requestedWorkerSelectors value to set. * @param scheduledOn the scheduledOn value to set. * @param unavailableForMatching the unavailableForMatching value to set. */ @Generated - private AcsRouterJobReceivedEventData(Map labels, Map tags, - AcsRouterJobStatus jobStatus, List requestedWorkerSelectors, - OffsetDateTime scheduledOn, boolean unavailableForMatching) { - super(labels, tags); + private AcsRouterJobReceivedEventData(String jobId, Map labels, Map tags, + AcsRouterJobStatus jobStatus, OffsetDateTime scheduledOn, boolean unavailableForMatching) { + super(jobId, labels, tags); this.jobStatus = jobStatus; - this.requestedWorkerSelectors = requestedWorkerSelectors; this.scheduledOn = scheduledOn; this.unavailableForMatching = unavailableForMatching; } @@ -195,17 +187,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -213,15 +194,13 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); jsonWriter.writeStringField("jobStatus", this.jobStatus == null ? null : this.jobStatus.toString()); - jsonWriter.writeArrayField("requestedWorkerSelectors", this.requestedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); jsonWriter.writeStringField("scheduledOn", this.scheduledOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.scheduledOn)); jsonWriter.writeBooleanField("unavailableForMatching", this.unavailableForMatching); @@ -242,9 +221,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -258,12 +237,12 @@ public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) thro String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -288,11 +267,11 @@ public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) thro } } AcsRouterJobReceivedEventData deserializedAcsRouterJobReceivedEventData = new AcsRouterJobReceivedEventData( - labels, tags, jobStatus, requestedWorkerSelectors, scheduledOn, unavailableForMatching); - deserializedAcsRouterJobReceivedEventData.jobId = jobId; + jobId, labels, tags, jobStatus, scheduledOn, unavailableForMatching); deserializedAcsRouterJobReceivedEventData.channelReference = channelReference; deserializedAcsRouterJobReceivedEventData.channelId = channelId; deserializedAcsRouterJobReceivedEventData.queueId = queueId; + deserializedAcsRouterJobReceivedEventData.requestedWorkerSelectors = requestedWorkerSelectors; deserializedAcsRouterJobReceivedEventData.classificationPolicyId = classificationPolicyId; deserializedAcsRouterJobReceivedEventData.priority = priority; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java index b57e9aa989aa..2d0c2316c1c3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java @@ -25,19 +25,19 @@ public final class AcsRouterJobSchedulingFailedEventData extends AcsRouterJobEve * Router Job Priority */ @Generated - private Integer priority; + private final int priority; /* * Router Job Scheduling Failed Attached Worker Selector Expired */ @Generated - private final List expiredAttachedWorkerSelectors; + private List expiredAttachedWorkerSelectors; /* * Router Job Scheduling Failed Requested Worker Selector Expired */ @Generated - private final List expiredRequestedWorkerSelectors; + private List expiredRequestedWorkerSelectors; /* * Router Job Scheduling Failed Scheduled Time in UTC @@ -69,28 +69,20 @@ public final class AcsRouterJobSchedulingFailedEventData extends AcsRouterJobEve @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobSchedulingFailedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. - * @param expiredAttachedWorkerSelectors the expiredAttachedWorkerSelectors value to set. - * @param expiredRequestedWorkerSelectors the expiredRequestedWorkerSelectors value to set. + * @param priority the priority value to set. * @param scheduledOn the scheduledOn value to set. */ @Generated - private AcsRouterJobSchedulingFailedEventData(Map labels, Map tags, - List expiredAttachedWorkerSelectors, - List expiredRequestedWorkerSelectors, OffsetDateTime scheduledOn) { - super(labels, tags); - this.expiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors; - this.expiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors; + private AcsRouterJobSchedulingFailedEventData(String jobId, Map labels, Map tags, + int priority, OffsetDateTime scheduledOn) { + super(jobId, labels, tags); + this.priority = priority; this.scheduledOn = scheduledOn; } @@ -100,7 +92,7 @@ private AcsRouterJobSchedulingFailedEventData(Map labels, Map writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("expiredRequestedWorkerSelectors", this.expiredRequestedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); + jsonWriter.writeIntField("priority", this.priority); jsonWriter.writeStringField("scheduledOn", this.scheduledOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.scheduledOn)); - jsonWriter.writeNumberField("priority", this.priority); jsonWriter.writeStringField("failureReason", this.failureReason); return jsonWriter.writeEndObject(); } @@ -224,33 +201,35 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; + int priority = 0; List expiredAttachedWorkerSelectors = null; List expiredRequestedWorkerSelectors = null; OffsetDateTime scheduledOn = null; - Integer priority = null; String failureReason = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { channelId = reader.getString(); } else if ("queueId".equals(fieldName)) { queueId = reader.getString(); + } else if ("priority".equals(fieldName)) { + priority = reader.getInt(); } else if ("expiredAttachedWorkerSelectors".equals(fieldName)) { expiredAttachedWorkerSelectors = reader.readArray(reader1 -> AcsRouterWorkerSelector.fromJson(reader1)); @@ -260,8 +239,6 @@ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonRead } else if ("scheduledOn".equals(fieldName)) { scheduledOn = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("priority".equals(fieldName)) { - priority = reader.getNullable(JsonReader::getInt); } else if ("failureReason".equals(fieldName)) { failureReason = reader.getString(); } else { @@ -269,13 +246,14 @@ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonRead } } AcsRouterJobSchedulingFailedEventData deserializedAcsRouterJobSchedulingFailedEventData - = new AcsRouterJobSchedulingFailedEventData(labels, tags, expiredAttachedWorkerSelectors, - expiredRequestedWorkerSelectors, scheduledOn); - deserializedAcsRouterJobSchedulingFailedEventData.jobId = jobId; + = new AcsRouterJobSchedulingFailedEventData(jobId, labels, tags, priority, scheduledOn); deserializedAcsRouterJobSchedulingFailedEventData.channelReference = channelReference; deserializedAcsRouterJobSchedulingFailedEventData.channelId = channelId; deserializedAcsRouterJobSchedulingFailedEventData.queueId = queueId; - deserializedAcsRouterJobSchedulingFailedEventData.priority = priority; + deserializedAcsRouterJobSchedulingFailedEventData.expiredAttachedWorkerSelectors + = expiredAttachedWorkerSelectors; + deserializedAcsRouterJobSchedulingFailedEventData.expiredRequestedWorkerSelectors + = expiredRequestedWorkerSelectors; deserializedAcsRouterJobSchedulingFailedEventData.failureReason = failureReason; return deserializedAcsRouterJobSchedulingFailedEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java index 9d79c3e54014..69af9240e6f7 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java @@ -47,21 +47,16 @@ public final class AcsRouterJobUnassignedEventData extends AcsRouterJobEventData @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobUnassignedEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterJobUnassignedEventData(Map labels, Map tags) { - super(labels, tags); + private AcsRouterJobUnassignedEventData(String jobId, Map labels, Map tags) { + super(jobId, labels, tags); } /** @@ -117,17 +112,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -135,9 +119,9 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -158,9 +142,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -170,12 +154,12 @@ public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) th String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -191,8 +175,7 @@ public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) th } } AcsRouterJobUnassignedEventData deserializedAcsRouterJobUnassignedEventData - = new AcsRouterJobUnassignedEventData(labels, tags); - deserializedAcsRouterJobUnassignedEventData.jobId = jobId; + = new AcsRouterJobUnassignedEventData(jobId, labels, tags); deserializedAcsRouterJobUnassignedEventData.channelReference = channelReference; deserializedAcsRouterJobUnassignedEventData.channelId = channelId; deserializedAcsRouterJobUnassignedEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java index 2d165a4a7690..91cd739ae5e8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java @@ -25,19 +25,19 @@ public final class AcsRouterJobWaitingForActivationEventData extends AcsRouterJo * Router Job Waiting For Activation Priority */ @Generated - private Integer priority; + private final int priority; /* * Router Job Waiting For Activation Worker Selector Expired */ @Generated - private final List expiredAttachedWorkerSelectors; + private List expiredAttachedWorkerSelectors; /* * Router Job Waiting For Activation Requested Worker Selector Expired */ @Generated - private final List expiredRequestedWorkerSelectors; + private List expiredRequestedWorkerSelectors; /* * Router Job Waiting For Activation Scheduled Time in UTC @@ -69,30 +69,21 @@ public final class AcsRouterJobWaitingForActivationEventData extends AcsRouterJo @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobWaitingForActivationEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. - * @param expiredAttachedWorkerSelectors the expiredAttachedWorkerSelectors value to set. - * @param expiredRequestedWorkerSelectors the expiredRequestedWorkerSelectors value to set. + * @param priority the priority value to set. * @param scheduledOn the scheduledOn value to set. * @param unavailableForMatching the unavailableForMatching value to set. */ @Generated - private AcsRouterJobWaitingForActivationEventData(Map labels, Map tags, - List expiredAttachedWorkerSelectors, - List expiredRequestedWorkerSelectors, OffsetDateTime scheduledOn, - boolean unavailableForMatching) { - super(labels, tags); - this.expiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors; - this.expiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors; + private AcsRouterJobWaitingForActivationEventData(String jobId, Map labels, + Map tags, int priority, OffsetDateTime scheduledOn, boolean unavailableForMatching) { + super(jobId, labels, tags); + this.priority = priority; this.scheduledOn = scheduledOn; this.unavailableForMatching = unavailableForMatching; } @@ -103,7 +94,7 @@ private AcsRouterJobWaitingForActivationEventData(Map labels, Ma * @return the priority value. */ @Generated - public Integer getPriority() { + public int getPriority() { return this.priority; } @@ -181,17 +172,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -199,20 +179,16 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("expiredRequestedWorkerSelectors", this.expiredRequestedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); + jsonWriter.writeIntField("priority", this.priority); jsonWriter.writeStringField("scheduledOn", this.scheduledOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.scheduledOn)); jsonWriter.writeBooleanField("unavailableForMatching", this.unavailableForMatching); - jsonWriter.writeNumberField("priority", this.priority); return jsonWriter.writeEndObject(); } @@ -228,33 +204,35 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobWaitingForActivationEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; + int priority = 0; List expiredAttachedWorkerSelectors = null; List expiredRequestedWorkerSelectors = null; OffsetDateTime scheduledOn = null; boolean unavailableForMatching = false; - Integer priority = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { channelId = reader.getString(); } else if ("queueId".equals(fieldName)) { queueId = reader.getString(); + } else if ("priority".equals(fieldName)) { + priority = reader.getInt(); } else if ("expiredAttachedWorkerSelectors".equals(fieldName)) { expiredAttachedWorkerSelectors = reader.readArray(reader1 -> AcsRouterWorkerSelector.fromJson(reader1)); @@ -266,20 +244,20 @@ public static AcsRouterJobWaitingForActivationEventData fromJson(JsonReader json .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("unavailableForMatching".equals(fieldName)) { unavailableForMatching = reader.getBoolean(); - } else if ("priority".equals(fieldName)) { - priority = reader.getNullable(JsonReader::getInt); } else { reader.skipChildren(); } } AcsRouterJobWaitingForActivationEventData deserializedAcsRouterJobWaitingForActivationEventData - = new AcsRouterJobWaitingForActivationEventData(labels, tags, expiredAttachedWorkerSelectors, - expiredRequestedWorkerSelectors, scheduledOn, unavailableForMatching); - deserializedAcsRouterJobWaitingForActivationEventData.jobId = jobId; + = new AcsRouterJobWaitingForActivationEventData(jobId, labels, tags, priority, scheduledOn, + unavailableForMatching); deserializedAcsRouterJobWaitingForActivationEventData.channelReference = channelReference; deserializedAcsRouterJobWaitingForActivationEventData.channelId = channelId; deserializedAcsRouterJobWaitingForActivationEventData.queueId = queueId; - deserializedAcsRouterJobWaitingForActivationEventData.priority = priority; + deserializedAcsRouterJobWaitingForActivationEventData.expiredAttachedWorkerSelectors + = expiredAttachedWorkerSelectors; + deserializedAcsRouterJobWaitingForActivationEventData.expiredRequestedWorkerSelectors + = expiredRequestedWorkerSelectors; return deserializedAcsRouterJobWaitingForActivationEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java index 1973c2ea88fe..28c50ba0df8a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java @@ -22,13 +22,13 @@ public final class AcsRouterJobWorkerSelectorsExpiredEventData extends AcsRouter * Router Job Worker Selectors Expired Requested Worker Selectors */ @Generated - private final List expiredRequestedWorkerSelectors; + private List expiredRequestedWorkerSelectors; /* * Router Job Worker Selectors Expired Attached Worker Selectors */ @Generated - private final List expiredAttachedWorkerSelectors; + private List expiredAttachedWorkerSelectors; /* * Router Job events Queue Id @@ -48,27 +48,17 @@ public final class AcsRouterJobWorkerSelectorsExpiredEventData extends AcsRouter @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterJobWorkerSelectorsExpiredEventData class. * + * @param jobId the jobId value to set. * @param labels the labels value to set. * @param tags the tags value to set. - * @param expiredRequestedWorkerSelectors the expiredRequestedWorkerSelectors value to set. - * @param expiredAttachedWorkerSelectors the expiredAttachedWorkerSelectors value to set. */ @Generated - private AcsRouterJobWorkerSelectorsExpiredEventData(Map labels, Map tags, - List expiredRequestedWorkerSelectors, - List expiredAttachedWorkerSelectors) { - super(labels, tags); - this.expiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors; - this.expiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors; + private AcsRouterJobWorkerSelectorsExpiredEventData(String jobId, Map labels, + Map tags) { + super(jobId, labels, tags); } /** @@ -124,17 +114,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -142,16 +121,12 @@ public String getJobId() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeArrayField("expiredRequestedWorkerSelectors", this.expiredRequestedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, - (writer, element) -> writer.writeJson(element)); return jsonWriter.writeEndObject(); } @@ -167,9 +142,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { + String jobId = null; Map labels = null; Map tags = null; - String jobId = null; String channelReference = null; String channelId = null; String queueId = null; @@ -179,12 +154,12 @@ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader js String fieldName = reader.getFieldName(); reader.nextToken(); - if ("labels".equals(fieldName)) { + if ("jobId".equals(fieldName)) { + jobId = reader.getString(); + } else if ("labels".equals(fieldName)) { labels = reader.readMap(reader1 -> reader1.getString()); } else if ("tags".equals(fieldName)) { tags = reader.readMap(reader1 -> reader1.getString()); - } else if ("jobId".equals(fieldName)) { - jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { @@ -202,12 +177,14 @@ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader js } } AcsRouterJobWorkerSelectorsExpiredEventData deserializedAcsRouterJobWorkerSelectorsExpiredEventData - = new AcsRouterJobWorkerSelectorsExpiredEventData(labels, tags, expiredRequestedWorkerSelectors, - expiredAttachedWorkerSelectors); - deserializedAcsRouterJobWorkerSelectorsExpiredEventData.jobId = jobId; + = new AcsRouterJobWorkerSelectorsExpiredEventData(jobId, labels, tags); deserializedAcsRouterJobWorkerSelectorsExpiredEventData.channelReference = channelReference; deserializedAcsRouterJobWorkerSelectorsExpiredEventData.channelId = channelId; deserializedAcsRouterJobWorkerSelectorsExpiredEventData.queueId = queueId; + deserializedAcsRouterJobWorkerSelectorsExpiredEventData.expiredRequestedWorkerSelectors + = expiredRequestedWorkerSelectors; + deserializedAcsRouterJobWorkerSelectorsExpiredEventData.expiredAttachedWorkerSelectors + = expiredAttachedWorkerSelectors; return deserializedAcsRouterJobWorkerSelectorsExpiredEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerDeletedEventData.java index 0bac3df6830c..c689da9cab56 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerDeletedEventData.java @@ -34,17 +34,14 @@ public final class AcsRouterWorkerDeletedEventData extends AcsRouterWorkerEventD @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerDeletedEventData class. + * + * @param jobId the jobId value to set. */ @Generated - private AcsRouterWorkerDeletedEventData() { + private AcsRouterWorkerDeletedEventData(String jobId) { + super(jobId); } /** @@ -80,17 +77,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -111,29 +97,37 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterWorkerDeletedEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterWorkerDeletedEventData. */ @Generated public static AcsRouterWorkerDeletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AcsRouterWorkerDeletedEventData deserializedAcsRouterWorkerDeletedEventData - = new AcsRouterWorkerDeletedEventData(); + String jobId = null; + String channelReference = null; + String channelId = null; + String workerId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("jobId".equals(fieldName)) { - deserializedAcsRouterWorkerDeletedEventData.jobId = reader.getString(); + jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { - deserializedAcsRouterWorkerDeletedEventData.channelReference = reader.getString(); + channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { - deserializedAcsRouterWorkerDeletedEventData.channelId = reader.getString(); + channelId = reader.getString(); } else if ("workerId".equals(fieldName)) { - deserializedAcsRouterWorkerDeletedEventData.workerId = reader.getString(); + workerId = reader.getString(); } else { reader.skipChildren(); } } + AcsRouterWorkerDeletedEventData deserializedAcsRouterWorkerDeletedEventData + = new AcsRouterWorkerDeletedEventData(jobId); + deserializedAcsRouterWorkerDeletedEventData.channelReference = channelReference; + deserializedAcsRouterWorkerDeletedEventData.channelId = channelId; + deserializedAcsRouterWorkerDeletedEventData.workerId = workerId; return deserializedAcsRouterWorkerDeletedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerEventData.java index 519053ac7454..0cb6632ae7e6 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerEventData.java @@ -34,17 +34,14 @@ public class AcsRouterWorkerEventData extends AcsRouterEventData { @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerEventData class. + * + * @param jobId the jobId value to set. */ @Generated - protected AcsRouterWorkerEventData() { + protected AcsRouterWorkerEventData(String jobId) { + super(jobId); } /** @@ -91,17 +88,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -122,28 +108,36 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterWorkerEventData if the JsonReader was pointing to an instance of it, or null if * it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterWorkerEventData. */ @Generated public static AcsRouterWorkerEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AcsRouterWorkerEventData deserializedAcsRouterWorkerEventData = new AcsRouterWorkerEventData(); + String jobId = null; + String channelReference = null; + String channelId = null; + String workerId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("jobId".equals(fieldName)) { - deserializedAcsRouterWorkerEventData.jobId = reader.getString(); + jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { - deserializedAcsRouterWorkerEventData.channelReference = reader.getString(); + channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { - deserializedAcsRouterWorkerEventData.channelId = reader.getString(); + channelId = reader.getString(); } else if ("workerId".equals(fieldName)) { - deserializedAcsRouterWorkerEventData.workerId = reader.getString(); + workerId = reader.getString(); } else { reader.skipChildren(); } } + AcsRouterWorkerEventData deserializedAcsRouterWorkerEventData = new AcsRouterWorkerEventData(jobId); + deserializedAcsRouterWorkerEventData.channelReference = channelReference; + deserializedAcsRouterWorkerEventData.channelId = channelId; + deserializedAcsRouterWorkerEventData.workerId = workerId; return deserializedAcsRouterWorkerEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferAcceptedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferAcceptedEventData.java index 88a497a1f560..4d0c2ba31ce2 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferAcceptedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferAcceptedEventData.java @@ -83,23 +83,19 @@ public final class AcsRouterWorkerOfferAcceptedEventData extends AcsRouterWorker @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerOfferAcceptedEventData class. * + * @param jobId the jobId value to set. * @param workerLabels the workerLabels value to set. * @param workerTags the workerTags value to set. * @param jobLabels the jobLabels value to set. * @param jobTags the jobTags value to set. */ @Generated - private AcsRouterWorkerOfferAcceptedEventData(Map workerLabels, Map workerTags, - Map jobLabels, Map jobTags) { + private AcsRouterWorkerOfferAcceptedEventData(String jobId, Map workerLabels, + Map workerTags, Map jobLabels, Map jobTags) { + super(jobId); this.workerLabels = workerLabels; this.workerTags = workerTags; this.jobLabels = jobLabels; @@ -219,17 +215,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -309,8 +294,7 @@ public static AcsRouterWorkerOfferAcceptedEventData fromJson(JsonReader jsonRead } } AcsRouterWorkerOfferAcceptedEventData deserializedAcsRouterWorkerOfferAcceptedEventData - = new AcsRouterWorkerOfferAcceptedEventData(workerLabels, workerTags, jobLabels, jobTags); - deserializedAcsRouterWorkerOfferAcceptedEventData.jobId = jobId; + = new AcsRouterWorkerOfferAcceptedEventData(jobId, workerLabels, workerTags, jobLabels, jobTags); deserializedAcsRouterWorkerOfferAcceptedEventData.channelReference = channelReference; deserializedAcsRouterWorkerOfferAcceptedEventData.channelId = channelId; deserializedAcsRouterWorkerOfferAcceptedEventData.workerId = workerId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferDeclinedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferDeclinedEventData.java index caf994ac9261..0bd3baea2005 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferDeclinedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferDeclinedEventData.java @@ -46,17 +46,14 @@ public final class AcsRouterWorkerOfferDeclinedEventData extends AcsRouterWorker @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerOfferDeclinedEventData class. + * + * @param jobId the jobId value to set. */ @Generated - private AcsRouterWorkerOfferDeclinedEventData() { + private AcsRouterWorkerOfferDeclinedEventData(String jobId) { + super(jobId); } /** @@ -112,17 +109,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -145,33 +131,45 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterWorkerOfferDeclinedEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterWorkerOfferDeclinedEventData. */ @Generated public static AcsRouterWorkerOfferDeclinedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AcsRouterWorkerOfferDeclinedEventData deserializedAcsRouterWorkerOfferDeclinedEventData - = new AcsRouterWorkerOfferDeclinedEventData(); + String jobId = null; + String channelReference = null; + String channelId = null; + String workerId = null; + String queueId = null; + String offerId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("jobId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferDeclinedEventData.jobId = reader.getString(); + jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { - deserializedAcsRouterWorkerOfferDeclinedEventData.channelReference = reader.getString(); + channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferDeclinedEventData.channelId = reader.getString(); + channelId = reader.getString(); } else if ("workerId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferDeclinedEventData.workerId = reader.getString(); + workerId = reader.getString(); } else if ("queueId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferDeclinedEventData.queueId = reader.getString(); + queueId = reader.getString(); } else if ("offerId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferDeclinedEventData.offerId = reader.getString(); + offerId = reader.getString(); } else { reader.skipChildren(); } } + AcsRouterWorkerOfferDeclinedEventData deserializedAcsRouterWorkerOfferDeclinedEventData + = new AcsRouterWorkerOfferDeclinedEventData(jobId); + deserializedAcsRouterWorkerOfferDeclinedEventData.channelReference = channelReference; + deserializedAcsRouterWorkerOfferDeclinedEventData.channelId = channelId; + deserializedAcsRouterWorkerOfferDeclinedEventData.workerId = workerId; + deserializedAcsRouterWorkerOfferDeclinedEventData.queueId = queueId; + deserializedAcsRouterWorkerOfferDeclinedEventData.offerId = offerId; return deserializedAcsRouterWorkerOfferDeclinedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferExpiredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferExpiredEventData.java index dd78d91c65db..99d7bfdfcb32 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferExpiredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferExpiredEventData.java @@ -46,17 +46,14 @@ public final class AcsRouterWorkerOfferExpiredEventData extends AcsRouterWorkerE @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerOfferExpiredEventData class. + * + * @param jobId the jobId value to set. */ @Generated - private AcsRouterWorkerOfferExpiredEventData() { + private AcsRouterWorkerOfferExpiredEventData(String jobId) { + super(jobId); } /** @@ -112,17 +109,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -145,33 +131,45 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterWorkerOfferExpiredEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterWorkerOfferExpiredEventData. */ @Generated public static AcsRouterWorkerOfferExpiredEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AcsRouterWorkerOfferExpiredEventData deserializedAcsRouterWorkerOfferExpiredEventData - = new AcsRouterWorkerOfferExpiredEventData(); + String jobId = null; + String channelReference = null; + String channelId = null; + String workerId = null; + String queueId = null; + String offerId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("jobId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferExpiredEventData.jobId = reader.getString(); + jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { - deserializedAcsRouterWorkerOfferExpiredEventData.channelReference = reader.getString(); + channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferExpiredEventData.channelId = reader.getString(); + channelId = reader.getString(); } else if ("workerId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferExpiredEventData.workerId = reader.getString(); + workerId = reader.getString(); } else if ("queueId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferExpiredEventData.queueId = reader.getString(); + queueId = reader.getString(); } else if ("offerId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferExpiredEventData.offerId = reader.getString(); + offerId = reader.getString(); } else { reader.skipChildren(); } } + AcsRouterWorkerOfferExpiredEventData deserializedAcsRouterWorkerOfferExpiredEventData + = new AcsRouterWorkerOfferExpiredEventData(jobId); + deserializedAcsRouterWorkerOfferExpiredEventData.channelReference = channelReference; + deserializedAcsRouterWorkerOfferExpiredEventData.channelId = channelId; + deserializedAcsRouterWorkerOfferExpiredEventData.workerId = workerId; + deserializedAcsRouterWorkerOfferExpiredEventData.queueId = queueId; + deserializedAcsRouterWorkerOfferExpiredEventData.offerId = offerId; return deserializedAcsRouterWorkerOfferExpiredEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferIssuedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferIssuedEventData.java index c8d03d8c5774..b2be8ea333f0 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferIssuedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferIssuedEventData.java @@ -92,15 +92,10 @@ public final class AcsRouterWorkerOfferIssuedEventData extends AcsRouterWorkerEv @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerOfferIssuedEventData class. * + * @param jobId the jobId value to set. * @param workerLabels the workerLabels value to set. * @param offeredOn the offeredOn value to set. * @param expiresOn the expiresOn value to set. @@ -109,9 +104,10 @@ public final class AcsRouterWorkerOfferIssuedEventData extends AcsRouterWorkerEv * @param jobTags the jobTags value to set. */ @Generated - private AcsRouterWorkerOfferIssuedEventData(Map workerLabels, OffsetDateTime offeredOn, - OffsetDateTime expiresOn, Map workerTags, Map jobLabels, - Map jobTags) { + private AcsRouterWorkerOfferIssuedEventData(String jobId, Map workerLabels, + OffsetDateTime offeredOn, OffsetDateTime expiresOn, Map workerTags, + Map jobLabels, Map jobTags) { + super(jobId); this.workerLabels = workerLabels; this.offeredOn = offeredOn; this.expiresOn = expiresOn; @@ -243,17 +239,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -341,9 +326,8 @@ public static AcsRouterWorkerOfferIssuedEventData fromJson(JsonReader jsonReader } } AcsRouterWorkerOfferIssuedEventData deserializedAcsRouterWorkerOfferIssuedEventData - = new AcsRouterWorkerOfferIssuedEventData(workerLabels, offeredOn, expiresOn, workerTags, jobLabels, - jobTags); - deserializedAcsRouterWorkerOfferIssuedEventData.jobId = jobId; + = new AcsRouterWorkerOfferIssuedEventData(jobId, workerLabels, offeredOn, expiresOn, workerTags, + jobLabels, jobTags); deserializedAcsRouterWorkerOfferIssuedEventData.channelReference = channelReference; deserializedAcsRouterWorkerOfferIssuedEventData.channelId = channelId; deserializedAcsRouterWorkerOfferIssuedEventData.workerId = workerId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferRevokedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferRevokedEventData.java index 9c4ca1304cd7..fff1fde688cd 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferRevokedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerOfferRevokedEventData.java @@ -46,17 +46,14 @@ public final class AcsRouterWorkerOfferRevokedEventData extends AcsRouterWorkerE @Generated private String channelReference; - /* - * Router Event Job ID - */ - @Generated - private String jobId; - /** * Creates an instance of AcsRouterWorkerOfferRevokedEventData class. + * + * @param jobId the jobId value to set. */ @Generated - private AcsRouterWorkerOfferRevokedEventData() { + private AcsRouterWorkerOfferRevokedEventData(String jobId) { + super(jobId); } /** @@ -112,17 +109,6 @@ public String getChannelReference() { return this.channelReference; } - /** - * Get the jobId property: Router Event Job ID. - * - * @return the jobId value. - */ - @Generated - @Override - public String getJobId() { - return this.jobId; - } - /** * {@inheritDoc} */ @@ -145,33 +131,45 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterWorkerOfferRevokedEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterWorkerOfferRevokedEventData. */ @Generated public static AcsRouterWorkerOfferRevokedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AcsRouterWorkerOfferRevokedEventData deserializedAcsRouterWorkerOfferRevokedEventData - = new AcsRouterWorkerOfferRevokedEventData(); + String jobId = null; + String channelReference = null; + String channelId = null; + String workerId = null; + String queueId = null; + String offerId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("jobId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferRevokedEventData.jobId = reader.getString(); + jobId = reader.getString(); } else if ("channelReference".equals(fieldName)) { - deserializedAcsRouterWorkerOfferRevokedEventData.channelReference = reader.getString(); + channelReference = reader.getString(); } else if ("channelId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferRevokedEventData.channelId = reader.getString(); + channelId = reader.getString(); } else if ("workerId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferRevokedEventData.workerId = reader.getString(); + workerId = reader.getString(); } else if ("queueId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferRevokedEventData.queueId = reader.getString(); + queueId = reader.getString(); } else if ("offerId".equals(fieldName)) { - deserializedAcsRouterWorkerOfferRevokedEventData.offerId = reader.getString(); + offerId = reader.getString(); } else { reader.skipChildren(); } } + AcsRouterWorkerOfferRevokedEventData deserializedAcsRouterWorkerOfferRevokedEventData + = new AcsRouterWorkerOfferRevokedEventData(jobId); + deserializedAcsRouterWorkerOfferRevokedEventData.channelReference = channelReference; + deserializedAcsRouterWorkerOfferRevokedEventData.channelId = channelId; + deserializedAcsRouterWorkerOfferRevokedEventData.workerId = workerId; + deserializedAcsRouterWorkerOfferRevokedEventData.queueId = queueId; + deserializedAcsRouterWorkerOfferRevokedEventData.offerId = offerId; return deserializedAcsRouterWorkerOfferRevokedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerRegisteredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerRegisteredEventData.java index 590ee62e84d0..0c8e0569042e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerRegisteredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerRegisteredEventData.java @@ -29,13 +29,13 @@ public final class AcsRouterWorkerRegisteredEventData implements JsonSerializabl * Router Worker Registered Queue Info */ @Generated - private final List queueAssignments; + private List queueAssignments; /* * Router Worker Registered Channel Configuration */ @Generated - private final List channelConfigurations; + private List channelConfigurations; /* * Router Worker Register Total Capacity @@ -58,17 +58,11 @@ public final class AcsRouterWorkerRegisteredEventData implements JsonSerializabl /** * Creates an instance of AcsRouterWorkerRegisteredEventData class. * - * @param queueAssignments the queueAssignments value to set. - * @param channelConfigurations the channelConfigurations value to set. * @param labels the labels value to set. * @param tags the tags value to set. */ @Generated - private AcsRouterWorkerRegisteredEventData(List queueAssignments, - List channelConfigurations, Map labels, - Map tags) { - this.queueAssignments = queueAssignments; - this.channelConfigurations = channelConfigurations; + private AcsRouterWorkerRegisteredEventData(Map labels, Map tags) { this.labels = labels; this.tags = tags; } @@ -140,10 +134,6 @@ public Map getTags() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("queueAssignments", this.queueAssignments, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("channelConfigurations", this.channelConfigurations, - (writer, element) -> writer.writeJson(element)); jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("workerId", this.workerId); @@ -191,7 +181,9 @@ public static AcsRouterWorkerRegisteredEventData fromJson(JsonReader jsonReader) } } AcsRouterWorkerRegisteredEventData deserializedAcsRouterWorkerRegisteredEventData - = new AcsRouterWorkerRegisteredEventData(queueAssignments, channelConfigurations, labels, tags); + = new AcsRouterWorkerRegisteredEventData(labels, tags); + deserializedAcsRouterWorkerRegisteredEventData.queueAssignments = queueAssignments; + deserializedAcsRouterWorkerRegisteredEventData.channelConfigurations = channelConfigurations; deserializedAcsRouterWorkerRegisteredEventData.workerId = workerId; deserializedAcsRouterWorkerRegisteredEventData.totalCapacity = totalCapacity; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerUpdatedEventData.java index a281aa1e6f0b..f74675d34e2b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterWorkerUpdatedEventData.java @@ -29,13 +29,13 @@ public final class AcsRouterWorkerUpdatedEventData implements JsonSerializable queueAssignments; + private List queueAssignments; /* * Router Worker Updated Channel Configuration */ @Generated - private final List channelConfigurations; + private List channelConfigurations; /* * Router Worker Updated Total Capacity @@ -59,26 +59,18 @@ public final class AcsRouterWorkerUpdatedEventData implements JsonSerializable updatedWorkerProperties; + private List updatedWorkerProperties; /** * Creates an instance of AcsRouterWorkerUpdatedEventData class. * - * @param queueAssignments the queueAssignments value to set. - * @param channelConfigurations the channelConfigurations value to set. * @param labels the labels value to set. * @param tags the tags value to set. - * @param updatedWorkerProperties the updatedWorkerProperties value to set. */ @Generated - private AcsRouterWorkerUpdatedEventData(List queueAssignments, - List channelConfigurations, Map labels, Map tags, - List updatedWorkerProperties) { - this.queueAssignments = queueAssignments; - this.channelConfigurations = channelConfigurations; + private AcsRouterWorkerUpdatedEventData(Map labels, Map tags) { this.labels = labels; this.tags = tags; - this.updatedWorkerProperties = updatedWorkerProperties; } /** @@ -158,14 +150,8 @@ public List getUpdatedWorkerProperties() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("queueAssignments", this.queueAssignments, - (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("channelConfigurations", this.channelConfigurations, - (writer, element) -> writer.writeJson(element)); jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("updatedWorkerProperties", this.updatedWorkerProperties, - (writer, element) -> writer.writeString(element == null ? null : element.toString())); jsonWriter.writeStringField("workerId", this.workerId); jsonWriter.writeNumberField("totalCapacity", this.totalCapacity); return jsonWriter.writeEndObject(); @@ -215,8 +201,10 @@ public static AcsRouterWorkerUpdatedEventData fromJson(JsonReader jsonReader) th } } AcsRouterWorkerUpdatedEventData deserializedAcsRouterWorkerUpdatedEventData - = new AcsRouterWorkerUpdatedEventData(queueAssignments, channelConfigurations, labels, tags, - updatedWorkerProperties); + = new AcsRouterWorkerUpdatedEventData(labels, tags); + deserializedAcsRouterWorkerUpdatedEventData.queueAssignments = queueAssignments; + deserializedAcsRouterWorkerUpdatedEventData.channelConfigurations = channelConfigurations; + deserializedAcsRouterWorkerUpdatedEventData.updatedWorkerProperties = updatedWorkerProperties; deserializedAcsRouterWorkerUpdatedEventData.workerId = workerId; deserializedAcsRouterWorkerUpdatedEventData.totalCapacity = totalCapacity; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java index a9c3c97c35cd..96652ba901cb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java @@ -30,22 +30,26 @@ public final class AcsSmsDeliveryAttemptProperties implements JsonSerializable { OffsetDateTime timestamp = null; - Integer segmentsSucceeded = null; - Integer segmentsFailed = null; + int segmentsSucceeded = 0; + int segmentsFailed = 0; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); @@ -115,19 +119,14 @@ public static AcsSmsDeliveryAttemptProperties fromJson(JsonReader jsonReader) th timestamp = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("segmentsSucceeded".equals(fieldName)) { - segmentsSucceeded = reader.getNullable(JsonReader::getInt); + segmentsSucceeded = reader.getInt(); } else if ("segmentsFailed".equals(fieldName)) { - segmentsFailed = reader.getNullable(JsonReader::getInt); + segmentsFailed = reader.getInt(); } else { reader.skipChildren(); } } - AcsSmsDeliveryAttemptProperties deserializedAcsSmsDeliveryAttemptProperties - = new AcsSmsDeliveryAttemptProperties(timestamp); - deserializedAcsSmsDeliveryAttemptProperties.segmentsSucceeded = segmentsSucceeded; - deserializedAcsSmsDeliveryAttemptProperties.segmentsFailed = segmentsFailed; - - return deserializedAcsSmsDeliveryAttemptProperties; + return new AcsSmsDeliveryAttemptProperties(timestamp, segmentsSucceeded, segmentsFailed); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java index 9a4b103bcc1e..e8ee76fa710b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java @@ -24,19 +24,19 @@ public final class AcsSmsDeliveryReportReceivedEventData extends AcsSmsEventBase * Status of Delivery */ @Generated - private String deliveryStatus; + private final String deliveryStatus; /* * Details about Delivery Status */ @Generated - private String deliveryStatusDetails; + private final String deliveryStatusDetails; /* * List of details of delivery attempts made */ @Generated - private final List deliveryAttempts; + private List deliveryAttempts; /* * The time at which the SMS delivery report was received @@ -50,34 +50,22 @@ public final class AcsSmsDeliveryReportReceivedEventData extends AcsSmsEventBase @Generated private String tag; - /* - * The identity of SMS message receiver - */ - @Generated - private String to; - - /* - * The identity of SMS message sender - */ - @Generated - private String from; - - /* - * The identity of the SMS message - */ - @Generated - private String messageId; - /** * Creates an instance of AcsSmsDeliveryReportReceivedEventData class. * - * @param deliveryAttempts the deliveryAttempts value to set. + * @param messageId the messageId value to set. + * @param from the from value to set. + * @param to the to value to set. + * @param deliveryStatus the deliveryStatus value to set. + * @param deliveryStatusDetails the deliveryStatusDetails value to set. * @param receivedTimestamp the receivedTimestamp value to set. */ @Generated - private AcsSmsDeliveryReportReceivedEventData(List deliveryAttempts, - OffsetDateTime receivedTimestamp) { - this.deliveryAttempts = deliveryAttempts; + private AcsSmsDeliveryReportReceivedEventData(String messageId, String from, String to, String deliveryStatus, + String deliveryStatusDetails, OffsetDateTime receivedTimestamp) { + super(messageId, from, to); + this.deliveryStatus = deliveryStatus; + this.deliveryStatusDetails = deliveryStatusDetails; this.receivedTimestamp = receivedTimestamp; } @@ -131,39 +119,6 @@ public String getTag() { return this.tag; } - /** - * Get the to property: The identity of SMS message receiver. - * - * @return the to value. - */ - @Generated - @Override - public String getTo() { - return this.to; - } - - /** - * Get the from property: The identity of SMS message sender. - * - * @return the from value. - */ - @Generated - @Override - public String getFrom() { - return this.from; - } - - /** - * Get the messageId property: The identity of the SMS message. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - /** * {@inheritDoc} */ @@ -174,14 +129,12 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("from", getFrom()); jsonWriter.writeStringField("to", getTo()); - jsonWriter.writeArrayField("deliveryAttempts", this.deliveryAttempts, - (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("deliveryStatus", this.deliveryStatus); + jsonWriter.writeStringField("deliveryStatusDetails", this.deliveryStatusDetails); jsonWriter.writeStringField("receivedTimestamp", this.receivedTimestamp == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.receivedTimestamp)); - jsonWriter.writeStringField("deliveryStatus", this.deliveryStatus); - jsonWriter.writeStringField("deliveryStatusDetails", this.deliveryStatusDetails); jsonWriter.writeStringField("tag", this.tag); return jsonWriter.writeEndObject(); } @@ -201,10 +154,10 @@ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonRead String messageId = null; String from = null; String to = null; - List deliveryAttempts = null; - OffsetDateTime receivedTimestamp = null; String deliveryStatus = null; String deliveryStatusDetails = null; + List deliveryAttempts = null; + OffsetDateTime receivedTimestamp = null; String tag = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); @@ -216,15 +169,15 @@ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonRead from = reader.getString(); } else if ("to".equals(fieldName)) { to = reader.getString(); + } else if ("deliveryStatus".equals(fieldName)) { + deliveryStatus = reader.getString(); + } else if ("deliveryStatusDetails".equals(fieldName)) { + deliveryStatusDetails = reader.getString(); } else if ("deliveryAttempts".equals(fieldName)) { deliveryAttempts = reader.readArray(reader1 -> AcsSmsDeliveryAttemptProperties.fromJson(reader1)); } else if ("receivedTimestamp".equals(fieldName)) { receivedTimestamp = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("deliveryStatus".equals(fieldName)) { - deliveryStatus = reader.getString(); - } else if ("deliveryStatusDetails".equals(fieldName)) { - deliveryStatusDetails = reader.getString(); } else if ("tag".equals(fieldName)) { tag = reader.getString(); } else { @@ -232,12 +185,9 @@ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonRead } } AcsSmsDeliveryReportReceivedEventData deserializedAcsSmsDeliveryReportReceivedEventData - = new AcsSmsDeliveryReportReceivedEventData(deliveryAttempts, receivedTimestamp); - deserializedAcsSmsDeliveryReportReceivedEventData.messageId = messageId; - deserializedAcsSmsDeliveryReportReceivedEventData.from = from; - deserializedAcsSmsDeliveryReportReceivedEventData.to = to; - deserializedAcsSmsDeliveryReportReceivedEventData.deliveryStatus = deliveryStatus; - deserializedAcsSmsDeliveryReportReceivedEventData.deliveryStatusDetails = deliveryStatusDetails; + = new AcsSmsDeliveryReportReceivedEventData(messageId, from, to, deliveryStatus, deliveryStatusDetails, + receivedTimestamp); + deserializedAcsSmsDeliveryReportReceivedEventData.deliveryAttempts = deliveryAttempts; deserializedAcsSmsDeliveryReportReceivedEventData.tag = tag; return deserializedAcsSmsDeliveryReportReceivedEventData; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java index eadb6458fd8d..a7155713e10a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java @@ -21,25 +21,32 @@ public class AcsSmsEventBaseProperties implements JsonSerializable { - AcsSmsEventBaseProperties deserializedAcsSmsEventBaseProperties = new AcsSmsEventBaseProperties(); + String messageId = null; + String from = null; + String to = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("messageId".equals(fieldName)) { - deserializedAcsSmsEventBaseProperties.messageId = reader.getString(); + messageId = reader.getString(); } else if ("from".equals(fieldName)) { - deserializedAcsSmsEventBaseProperties.from = reader.getString(); + from = reader.getString(); } else if ("to".equals(fieldName)) { - deserializedAcsSmsEventBaseProperties.to = reader.getString(); + to = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedAcsSmsEventBaseProperties; + return new AcsSmsEventBaseProperties(messageId, from, to); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java index a9f228817d1c..39ee6f5b052e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java @@ -23,7 +23,7 @@ public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties { * The SMS content */ @Generated - private String message; + private final String message; /* * The time at which the SMS was received @@ -37,32 +37,21 @@ public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties { @Generated private final int segmentCount; - /* - * The identity of SMS message receiver - */ - @Generated - private String to; - - /* - * The identity of SMS message sender - */ - @Generated - private String from; - - /* - * The identity of the SMS message - */ - @Generated - private String messageId; - /** * Creates an instance of AcsSmsReceivedEventData class. * + * @param messageId the messageId value to set. + * @param from the from value to set. + * @param to the to value to set. + * @param message the message value to set. * @param receivedTimestamp the receivedTimestamp value to set. * @param segmentCount the segmentCount value to set. */ @Generated - private AcsSmsReceivedEventData(OffsetDateTime receivedTimestamp, int segmentCount) { + private AcsSmsReceivedEventData(String messageId, String from, String to, String message, + OffsetDateTime receivedTimestamp, int segmentCount) { + super(messageId, from, to); + this.message = message; this.receivedTimestamp = receivedTimestamp; this.segmentCount = segmentCount; } @@ -97,39 +86,6 @@ public int getSegmentCount() { return this.segmentCount; } - /** - * Get the to property: The identity of SMS message receiver. - * - * @return the to value. - */ - @Generated - @Override - public String getTo() { - return this.to; - } - - /** - * Get the from property: The identity of SMS message sender. - * - * @return the from value. - */ - @Generated - @Override - public String getFrom() { - return this.from; - } - - /** - * Get the messageId property: The identity of the SMS message. - * - * @return the messageId value. - */ - @Generated - @Override - public String getMessageId() { - return this.messageId; - } - /** * {@inheritDoc} */ @@ -140,12 +96,12 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("from", getFrom()); jsonWriter.writeStringField("to", getTo()); + jsonWriter.writeStringField("message", this.message); jsonWriter.writeStringField("receivedTimestamp", this.receivedTimestamp == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.receivedTimestamp)); jsonWriter.writeIntField("segmentCount", this.segmentCount); - jsonWriter.writeStringField("message", this.message); return jsonWriter.writeEndObject(); } @@ -164,9 +120,9 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE String messageId = null; String from = null; String to = null; + String message = null; OffsetDateTime receivedTimestamp = null; int segmentCount = 0; - String message = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); @@ -177,25 +133,18 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE from = reader.getString(); } else if ("to".equals(fieldName)) { to = reader.getString(); + } else if ("message".equals(fieldName)) { + message = reader.getString(); } else if ("receivedTimestamp".equals(fieldName)) { receivedTimestamp = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("segmentCount".equals(fieldName)) { segmentCount = reader.getInt(); - } else if ("message".equals(fieldName)) { - message = reader.getString(); } else { reader.skipChildren(); } } - AcsSmsReceivedEventData deserializedAcsSmsReceivedEventData - = new AcsSmsReceivedEventData(receivedTimestamp, segmentCount); - deserializedAcsSmsReceivedEventData.messageId = messageId; - deserializedAcsSmsReceivedEventData.from = from; - deserializedAcsSmsReceivedEventData.to = to; - deserializedAcsSmsReceivedEventData.message = message; - - return deserializedAcsSmsReceivedEventData; + return new AcsSmsReceivedEventData(messageId, from, to, message, receivedTimestamp, segmentCount); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerClosedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerClosedEventData.java new file mode 100644 index 000000000000..dc1dea66c570 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerClosedEventData.java @@ -0,0 +1,107 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Closed event. + */ +@Immutable +public final class ApiManagementCircuitBreakerClosedEventData + implements JsonSerializable { + /* + * Name of the backend for which the circuit has closed. + */ + @Generated + private final String backendName; + + /* + * Information related to the circuit breaker configured on the backend. + */ + @Generated + private final ApiManagementCircuitBreakerProperties circuitBreaker; + + /** + * Creates an instance of ApiManagementCircuitBreakerClosedEventData class. + * + * @param backendName the backendName value to set. + * @param circuitBreaker the circuitBreaker value to set. + */ + @Generated + private ApiManagementCircuitBreakerClosedEventData(String backendName, + ApiManagementCircuitBreakerProperties circuitBreaker) { + this.backendName = backendName; + this.circuitBreaker = circuitBreaker; + } + + /** + * Get the backendName property: Name of the backend for which the circuit has closed. + * + * @return the backendName value. + */ + @Generated + public String getBackendName() { + return this.backendName; + } + + /** + * Get the circuitBreaker property: Information related to the circuit breaker configured on the backend. + * + * @return the circuitBreaker value. + */ + @Generated + public ApiManagementCircuitBreakerProperties getCircuitBreaker() { + return this.circuitBreaker; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("backendName", this.backendName); + jsonWriter.writeJsonField("circuitBreaker", this.circuitBreaker); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerClosedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerClosedEventData if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerClosedEventData. + */ + @Generated + public static ApiManagementCircuitBreakerClosedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String backendName = null; + ApiManagementCircuitBreakerProperties circuitBreaker = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("backendName".equals(fieldName)) { + backendName = reader.getString(); + } else if ("circuitBreaker".equals(fieldName)) { + circuitBreaker = ApiManagementCircuitBreakerProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + return new ApiManagementCircuitBreakerClosedEventData(backendName, circuitBreaker); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerOpenedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerOpenedEventData.java new file mode 100644 index 000000000000..6e9f4bb01b47 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerOpenedEventData.java @@ -0,0 +1,107 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Opened event. + */ +@Immutable +public final class ApiManagementCircuitBreakerOpenedEventData + implements JsonSerializable { + /* + * Name of the backend for which the circuit has opened. + */ + @Generated + private final String backendName; + + /* + * Information related to the circuit breaker configured on the backend. + */ + @Generated + private final ApiManagementCircuitBreakerProperties circuitBreaker; + + /** + * Creates an instance of ApiManagementCircuitBreakerOpenedEventData class. + * + * @param backendName the backendName value to set. + * @param circuitBreaker the circuitBreaker value to set. + */ + @Generated + private ApiManagementCircuitBreakerOpenedEventData(String backendName, + ApiManagementCircuitBreakerProperties circuitBreaker) { + this.backendName = backendName; + this.circuitBreaker = circuitBreaker; + } + + /** + * Get the backendName property: Name of the backend for which the circuit has opened. + * + * @return the backendName value. + */ + @Generated + public String getBackendName() { + return this.backendName; + } + + /** + * Get the circuitBreaker property: Information related to the circuit breaker configured on the backend. + * + * @return the circuitBreaker value. + */ + @Generated + public ApiManagementCircuitBreakerProperties getCircuitBreaker() { + return this.circuitBreaker; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("backendName", this.backendName); + jsonWriter.writeJsonField("circuitBreaker", this.circuitBreaker); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerOpenedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerOpenedEventData if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerOpenedEventData. + */ + @Generated + public static ApiManagementCircuitBreakerOpenedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String backendName = null; + ApiManagementCircuitBreakerProperties circuitBreaker = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("backendName".equals(fieldName)) { + backendName = reader.getString(); + } else if ("circuitBreaker".equals(fieldName)) { + circuitBreaker = ApiManagementCircuitBreakerProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + return new ApiManagementCircuitBreakerOpenedEventData(backendName, circuitBreaker); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerProperties.java new file mode 100644 index 000000000000..cee2dd83e5e2 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerProperties.java @@ -0,0 +1,88 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.BinaryData; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Map; + +/** + * Information related to the circuit breaker configured on the backend. + */ +@Immutable +public final class ApiManagementCircuitBreakerProperties + implements JsonSerializable { + /* + * Overview of all configured rules and respective details. + */ + @Generated + private final Map> rules; + + /** + * Creates an instance of ApiManagementCircuitBreakerProperties class. + * + * @param rules the rules value to set. + */ + @Generated + private ApiManagementCircuitBreakerProperties(Map> rules) { + this.rules = rules; + } + + /** + * Get the rules property: Overview of all configured rules and respective details. + * + * @return the rules value. + */ + @Generated + public Map> getRules() { + return this.rules; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeMapField("rules", this.rules, (writer, element) -> writer.writeMap(element, + (writer1, element1) -> writer1.writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerProperties if the JsonReader was pointing to an instance of it, + * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerProperties. + */ + @Generated + public static ApiManagementCircuitBreakerProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + Map> rules = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("rules".equals(fieldName)) { + rules = reader.readMap(reader1 -> reader1.readMap(reader2 -> reader2 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())))); + } else { + reader.skipChildren(); + } + } + return new ApiManagementCircuitBreakerProperties(rules); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerPropertiesRule.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerPropertiesRule.java new file mode 100644 index 000000000000..086cb5ad3eb3 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerPropertiesRule.java @@ -0,0 +1,61 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * The ApiManagementCircuitBreakerPropertiesRule model. + */ +@Immutable +public final class ApiManagementCircuitBreakerPropertiesRule + implements JsonSerializable { + /** + * Creates an instance of ApiManagementCircuitBreakerPropertiesRule class. + */ + @Generated + private ApiManagementCircuitBreakerPropertiesRule() { + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerPropertiesRule from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerPropertiesRule if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerPropertiesRule. + */ + @Generated + public static ApiManagementCircuitBreakerPropertiesRule fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementCircuitBreakerPropertiesRule deserializedApiManagementCircuitBreakerPropertiesRule + = new ApiManagementCircuitBreakerPropertiesRule(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + reader.skipChildren(); + } + + return deserializedApiManagementCircuitBreakerPropertiesRule; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementExpiredGatewayTokenProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementExpiredGatewayTokenProperties.java new file mode 100644 index 000000000000..eba02c6bb607 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementExpiredGatewayTokenProperties.java @@ -0,0 +1,89 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Information related to a gateway token that has expired for a self-hosted gateway deployment. + */ +@Immutable +public final class ApiManagementExpiredGatewayTokenProperties + implements JsonSerializable { + /* + * Timestamp when the gateway token has expired. + */ + @Generated + private final OffsetDateTime expiredAtUtc; + + /** + * Creates an instance of ApiManagementExpiredGatewayTokenProperties class. + * + * @param expiredAtUtc the expiredAtUtc value to set. + */ + @Generated + private ApiManagementExpiredGatewayTokenProperties(OffsetDateTime expiredAtUtc) { + this.expiredAtUtc = expiredAtUtc; + } + + /** + * Get the expiredAtUtc property: Timestamp when the gateway token has expired. + * + * @return the expiredAtUtc value. + */ + @Generated + public OffsetDateTime getExpiredAtUtc() { + return this.expiredAtUtc; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("expiredAtUtc", + this.expiredAtUtc == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.expiredAtUtc)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementExpiredGatewayTokenProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementExpiredGatewayTokenProperties if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementExpiredGatewayTokenProperties. + */ + @Generated + public static ApiManagementExpiredGatewayTokenProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + OffsetDateTime expiredAtUtc = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("expiredAtUtc".equals(fieldName)) { + expiredAtUtc = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + return new ApiManagementExpiredGatewayTokenProperties(expiredAtUtc); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayProperties.java new file mode 100644 index 000000000000..3a496b15471a --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayProperties.java @@ -0,0 +1,110 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Information related to a given self-hosted gateway deployment. + */ +@Immutable +public final class ApiManagementGatewayProperties implements JsonSerializable { + /* + * Id of Gateway that is used to deploy the gateway to get the configuration for. This is the ARM resource ID + * referenced in the Azure API Management instance. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service// + * gateway/` + */ + @Generated + private final String gatewayId; + + /* + * Unique instance ID of the deployed gateway + */ + @Generated + private final String instanceId; + + /** + * Creates an instance of ApiManagementGatewayProperties class. + * + * @param gatewayId the gatewayId value to set. + * @param instanceId the instanceId value to set. + */ + @Generated + private ApiManagementGatewayProperties(String gatewayId, String instanceId) { + this.gatewayId = gatewayId; + this.instanceId = instanceId; + } + + /** + * Get the gatewayId property: Id of Gateway that is used to deploy the gateway to get the configuration for. This + * is the ARM resource ID referenced in the Azure API Management instance. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/gateway/<GatewayName>`. + * + * @return the gatewayId value. + */ + @Generated + public String getGatewayId() { + return this.gatewayId; + } + + /** + * Get the instanceId property: Unique instance ID of the deployed gateway. + * + * @return the instanceId value. + */ + @Generated + public String getInstanceId() { + return this.instanceId; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("gatewayId", this.gatewayId); + jsonWriter.writeStringField("instanceId", this.instanceId); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayProperties if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementGatewayProperties. + */ + @Generated + public static ApiManagementGatewayProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String gatewayId = null; + String instanceId = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("gatewayId".equals(fieldName)) { + gatewayId = reader.getString(); + } else if ("instanceId".equals(fieldName)) { + instanceId = reader.getString(); + } else { + reader.skipChildren(); + } + } + return new ApiManagementGatewayProperties(gatewayId, instanceId); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenExpiredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenExpiredEventData.java new file mode 100644 index 000000000000..7c6af583c9dc --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenExpiredEventData.java @@ -0,0 +1,108 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenExpired event. + */ +@Immutable +public final class ApiManagementGatewayTokenExpiredEventData + implements JsonSerializable { + /* + * Information related to a given self-hosted gateway deployment. + */ + @Generated + private final ApiManagementGatewayProperties gatewayInfo; + + /* + * Information related to a an expired gateway token for a self-hosted gateway deployment. + */ + @Generated + private final ApiManagementExpiredGatewayTokenProperties tokenInfo; + + /** + * Creates an instance of ApiManagementGatewayTokenExpiredEventData class. + * + * @param gatewayInfo the gatewayInfo value to set. + * @param tokenInfo the tokenInfo value to set. + */ + @Generated + private ApiManagementGatewayTokenExpiredEventData(ApiManagementGatewayProperties gatewayInfo, + ApiManagementExpiredGatewayTokenProperties tokenInfo) { + this.gatewayInfo = gatewayInfo; + this.tokenInfo = tokenInfo; + } + + /** + * Get the gatewayInfo property: Information related to a given self-hosted gateway deployment. + * + * @return the gatewayInfo value. + */ + @Generated + public ApiManagementGatewayProperties getGatewayInfo() { + return this.gatewayInfo; + } + + /** + * Get the tokenInfo property: Information related to a an expired gateway token for a self-hosted gateway + * deployment. + * + * @return the tokenInfo value. + */ + @Generated + public ApiManagementExpiredGatewayTokenProperties getTokenInfo() { + return this.tokenInfo; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("gatewayInfo", this.gatewayInfo); + jsonWriter.writeJsonField("tokenInfo", this.tokenInfo); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayTokenExpiredEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayTokenExpiredEventData if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementGatewayTokenExpiredEventData. + */ + @Generated + public static ApiManagementGatewayTokenExpiredEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementGatewayProperties gatewayInfo = null; + ApiManagementExpiredGatewayTokenProperties tokenInfo = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("gatewayInfo".equals(fieldName)) { + gatewayInfo = ApiManagementGatewayProperties.fromJson(reader); + } else if ("tokenInfo".equals(fieldName)) { + tokenInfo = ApiManagementExpiredGatewayTokenProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + return new ApiManagementGatewayTokenExpiredEventData(gatewayInfo, tokenInfo); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryEventData.java new file mode 100644 index 000000000000..b3bbdbf07ff7 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryEventData.java @@ -0,0 +1,108 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenNearExpiry event. + */ +@Immutable +public final class ApiManagementGatewayTokenNearExpiryEventData + implements JsonSerializable { + /* + * Information related to a given self-hosted gateway deployment. + */ + @Generated + private final ApiManagementGatewayProperties gatewayInfo; + + /* + * Information related to a an expired gateway token for a self-hosted gateway deployment. + */ + @Generated + private final ApiManagementNearExpiryGatewayTokenProperties tokenInfo; + + /** + * Creates an instance of ApiManagementGatewayTokenNearExpiryEventData class. + * + * @param gatewayInfo the gatewayInfo value to set. + * @param tokenInfo the tokenInfo value to set. + */ + @Generated + private ApiManagementGatewayTokenNearExpiryEventData(ApiManagementGatewayProperties gatewayInfo, + ApiManagementNearExpiryGatewayTokenProperties tokenInfo) { + this.gatewayInfo = gatewayInfo; + this.tokenInfo = tokenInfo; + } + + /** + * Get the gatewayInfo property: Information related to a given self-hosted gateway deployment. + * + * @return the gatewayInfo value. + */ + @Generated + public ApiManagementGatewayProperties getGatewayInfo() { + return this.gatewayInfo; + } + + /** + * Get the tokenInfo property: Information related to a an expired gateway token for a self-hosted gateway + * deployment. + * + * @return the tokenInfo value. + */ + @Generated + public ApiManagementNearExpiryGatewayTokenProperties getTokenInfo() { + return this.tokenInfo; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("gatewayInfo", this.gatewayInfo); + jsonWriter.writeJsonField("tokenInfo", this.tokenInfo); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayTokenNearExpiryEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayTokenNearExpiryEventData if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementGatewayTokenNearExpiryEventData. + */ + @Generated + public static ApiManagementGatewayTokenNearExpiryEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementGatewayProperties gatewayInfo = null; + ApiManagementNearExpiryGatewayTokenProperties tokenInfo = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("gatewayInfo".equals(fieldName)) { + gatewayInfo = ApiManagementGatewayProperties.fromJson(reader); + } else if ("tokenInfo".equals(fieldName)) { + tokenInfo = ApiManagementNearExpiryGatewayTokenProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + return new ApiManagementGatewayTokenNearExpiryEventData(gatewayInfo, tokenInfo); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementNearExpiryGatewayTokenProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementNearExpiryGatewayTokenProperties.java new file mode 100644 index 000000000000..56edae6259f0 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementNearExpiryGatewayTokenProperties.java @@ -0,0 +1,89 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Information related to a gateway token that is near expiry for a self-hosted gateway deployment. + */ +@Immutable +public final class ApiManagementNearExpiryGatewayTokenProperties + implements JsonSerializable { + /* + * Timestamp when the gateway token will expire. + */ + @Generated + private final OffsetDateTime expiredAtUtc; + + /** + * Creates an instance of ApiManagementNearExpiryGatewayTokenProperties class. + * + * @param expiredAtUtc the expiredAtUtc value to set. + */ + @Generated + private ApiManagementNearExpiryGatewayTokenProperties(OffsetDateTime expiredAtUtc) { + this.expiredAtUtc = expiredAtUtc; + } + + /** + * Get the expiredAtUtc property: Timestamp when the gateway token will expire. + * + * @return the expiredAtUtc value. + */ + @Generated + public OffsetDateTime getExpiredAtUtc() { + return this.expiredAtUtc; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("expiredAtUtc", + this.expiredAtUtc == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.expiredAtUtc)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementNearExpiryGatewayTokenProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementNearExpiryGatewayTokenProperties if the JsonReader was pointing to an + * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ApiManagementNearExpiryGatewayTokenProperties. + */ + @Generated + public static ApiManagementNearExpiryGatewayTokenProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + OffsetDateTime expiredAtUtc = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("expiredAtUtc".equals(fieldName)) { + expiredAtUtc = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + return new ApiManagementNearExpiryGatewayTokenProperties(expiredAtUtc); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterCreatedEventData.java index 154f2fd2ecfc..c7c92c938297 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterCreatedEventData.java @@ -86,12 +86,6 @@ public List getAddedHostNames() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); - jsonWriter.writeArrayField("addedHostNames", getAddedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("removedHostNames", getRemovedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("inMaintenanceHostNames", getInMaintenanceHostNames(), - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterDeletedEventData.java index 793ba9b08006..7200b4ed6e6e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterDeletedEventData.java @@ -86,12 +86,6 @@ public List getAddedHostNames() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); - jsonWriter.writeArrayField("addedHostNames", getAddedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("removedHostNames", getRemovedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("inMaintenanceHostNames", getInMaintenanceHostNames(), - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterEventData.java index 701dbee8c081..57199df33575 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterEventData.java @@ -136,12 +136,6 @@ AvsClusterEventData setInMaintenanceHostNames(List inMaintenanceHostName public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", this.operationId); - jsonWriter.writeArrayField("addedHostNames", this.addedHostNames, - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("removedHostNames", this.removedHostNames, - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("inMaintenanceHostNames", this.inMaintenanceHostNames, - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterFailedEventData.java index 5249363038a8..b0426968906e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterFailedEventData.java @@ -102,12 +102,6 @@ public List getAddedHostNames() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); - jsonWriter.writeArrayField("addedHostNames", getAddedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("removedHostNames", getRemovedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("inMaintenanceHostNames", getInMaintenanceHostNames(), - (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("failureMessage", this.failureMessage); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatedEventData.java index 9a059509d5e3..eb6eea3ec534 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatedEventData.java @@ -86,12 +86,6 @@ public List getAddedHostNames() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); - jsonWriter.writeArrayField("addedHostNames", getAddedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("removedHostNames", getRemovedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("inMaintenanceHostNames", getInMaintenanceHostNames(), - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatingEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatingEventData.java index 83766758e562..07d5e8775ae5 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatingEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsClusterUpdatingEventData.java @@ -86,12 +86,6 @@ public List getAddedHostNames() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); - jsonWriter.writeArrayField("addedHostNames", getAddedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("removedHostNames", getRemovedHostNames(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("inMaintenanceHostNames", getInMaintenanceHostNames(), - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionCancelledEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionCancelledEventData.java index 10a80819e149..105efca17c1e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionCancelledEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionCancelledEventData.java @@ -54,7 +54,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); jsonWriter.writeStringField("cmdletId", getCmdletId()); - jsonWriter.writeArrayField("output", getOutput(), (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionEventData.java index 84072a16452a..53a67e64f3f8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionEventData.java @@ -99,7 +99,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", this.operationId); jsonWriter.writeStringField("cmdletId", this.cmdletId); - jsonWriter.writeArrayField("output", this.output, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFailedEventData.java index 67efb0e91354..a75d3683f637 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFailedEventData.java @@ -70,7 +70,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); jsonWriter.writeStringField("cmdletId", getCmdletId()); - jsonWriter.writeArrayField("output", getOutput(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("failureMessage", this.failureMessage); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFinishedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFinishedEventData.java index d6e9c7affdc6..5da44c142050 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFinishedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionFinishedEventData.java @@ -73,7 +73,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); jsonWriter.writeStringField("cmdletId", getCmdletId()); - jsonWriter.writeArrayField("output", getOutput(), (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("namedOutputs", this.namedOutputs, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionStartedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionStartedEventData.java index 5bc14500e88e..6e9c7c0e8835 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionStartedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AvsScriptExecutionStartedEventData.java @@ -54,7 +54,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); jsonWriter.writeStringField("cmdletId", getCmdletId()); - jsonWriter.writeArrayField("output", getOutput(), (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/CommunicationIdentifierModel.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/CommunicationIdentifierModel.java index b28b68ee2f47..e64b35915cd7 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/CommunicationIdentifierModel.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/CommunicationIdentifierModel.java @@ -23,13 +23,13 @@ public final class CommunicationIdentifierModel implements JsonSerializable { - CommunicationIdentifierKind kind = null; + String rawId = null; CommunicationUserIdentifierModel communicationUser = null; + CommunicationIdentifierKind kind = null; PhoneNumberIdentifierModel phoneNumber = null; MicrosoftTeamsUserIdentifierModel microsoftTeamsUser = null; MicrosoftTeamsAppIdentifier microsoftTeamsApp = null; - String rawId = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - kind = CommunicationIdentifierKind.fromString(reader.getString()); + if ("rawId".equals(fieldName)) { + rawId = reader.getString(); } else if ("communicationUser".equals(fieldName)) { communicationUser = CommunicationUserIdentifierModel.fromJson(reader); + } else if ("kind".equals(fieldName)) { + kind = CommunicationIdentifierKind.fromString(reader.getString()); } else if ("phoneNumber".equals(fieldName)) { phoneNumber = PhoneNumberIdentifierModel.fromJson(reader); } else if ("microsoftTeamsUser".equals(fieldName)) { microsoftTeamsUser = MicrosoftTeamsUserIdentifierModel.fromJson(reader); } else if ("microsoftTeamsApp".equals(fieldName)) { microsoftTeamsApp = MicrosoftTeamsAppIdentifier.fromJson(reader); - } else if ("rawId".equals(fieldName)) { - rawId = reader.getString(); } else { reader.skipChildren(); } } - CommunicationIdentifierModel deserializedCommunicationIdentifierModel = new CommunicationIdentifierModel( - kind, communicationUser, phoneNumber, microsoftTeamsUser, microsoftTeamsApp); - deserializedCommunicationIdentifierModel.rawId = rawId; + CommunicationIdentifierModel deserializedCommunicationIdentifierModel + = new CommunicationIdentifierModel(rawId, communicationUser); + deserializedCommunicationIdentifierModel.kind = kind; + deserializedCommunicationIdentifierModel.phoneNumber = phoneNumber; + deserializedCommunicationIdentifierModel.microsoftTeamsUser = microsoftTeamsUser; + deserializedCommunicationIdentifierModel.microsoftTeamsApp = microsoftTeamsApp; return deserializedCommunicationIdentifierModel; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EdgeSolutionVersionPublishedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EdgeSolutionVersionPublishedEventData.java new file mode 100644 index 000000000000..819ba0c1fcc3 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EdgeSolutionVersionPublishedEventData.java @@ -0,0 +1,219 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Edge.SolutionVersionPublished event. + */ +@Immutable +public final class EdgeSolutionVersionPublishedEventData + implements JsonSerializable { + /* + * A GUID to uniquely track External Solution Validation + */ + @Generated + private final String externalValidationId; + + /* + * ARM ID of the Target resource + */ + @Generated + private final String targetId; + + /* + * ARM ID of the Solution Template resource + */ + @Generated + private final String solutionTemplateId; + + /* + * ARM ID of the Solution Template Version resource + */ + @Generated + private final String solutionTemplateVersionId; + + /* + * ARM ID of the Solution Version resource + */ + @Generated + private final String solutionVersionId; + + /* + * API Version supported for the resources + */ + @Generated + private final String apiVersion; + + /* + * Direct URL to callback for updating validation status + */ + @Generated + private final String callbackUrl; + + /** + * Creates an instance of EdgeSolutionVersionPublishedEventData class. + * + * @param externalValidationId the externalValidationId value to set. + * @param targetId the targetId value to set. + * @param solutionTemplateId the solutionTemplateId value to set. + * @param solutionTemplateVersionId the solutionTemplateVersionId value to set. + * @param solutionVersionId the solutionVersionId value to set. + * @param apiVersion the apiVersion value to set. + * @param callbackUrl the callbackUrl value to set. + */ + @Generated + private EdgeSolutionVersionPublishedEventData(String externalValidationId, String targetId, + String solutionTemplateId, String solutionTemplateVersionId, String solutionVersionId, String apiVersion, + String callbackUrl) { + this.externalValidationId = externalValidationId; + this.targetId = targetId; + this.solutionTemplateId = solutionTemplateId; + this.solutionTemplateVersionId = solutionTemplateVersionId; + this.solutionVersionId = solutionVersionId; + this.apiVersion = apiVersion; + this.callbackUrl = callbackUrl; + } + + /** + * Get the externalValidationId property: A GUID to uniquely track External Solution Validation. + * + * @return the externalValidationId value. + */ + @Generated + public String getExternalValidationId() { + return this.externalValidationId; + } + + /** + * Get the targetId property: ARM ID of the Target resource. + * + * @return the targetId value. + */ + @Generated + public String getTargetId() { + return this.targetId; + } + + /** + * Get the solutionTemplateId property: ARM ID of the Solution Template resource. + * + * @return the solutionTemplateId value. + */ + @Generated + public String getSolutionTemplateId() { + return this.solutionTemplateId; + } + + /** + * Get the solutionTemplateVersionId property: ARM ID of the Solution Template Version resource. + * + * @return the solutionTemplateVersionId value. + */ + @Generated + public String getSolutionTemplateVersionId() { + return this.solutionTemplateVersionId; + } + + /** + * Get the solutionVersionId property: ARM ID of the Solution Version resource. + * + * @return the solutionVersionId value. + */ + @Generated + public String getSolutionVersionId() { + return this.solutionVersionId; + } + + /** + * Get the apiVersion property: API Version supported for the resources. + * + * @return the apiVersion value. + */ + @Generated + public String getApiVersion() { + return this.apiVersion; + } + + /** + * Get the callbackUrl property: Direct URL to callback for updating validation status. + * + * @return the callbackUrl value. + */ + @Generated + public String getCallbackUrl() { + return this.callbackUrl; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("externalValidationId", this.externalValidationId); + jsonWriter.writeStringField("targetId", this.targetId); + jsonWriter.writeStringField("solutionTemplateId", this.solutionTemplateId); + jsonWriter.writeStringField("solutionTemplateVersionId", this.solutionTemplateVersionId); + jsonWriter.writeStringField("solutionVersionId", this.solutionVersionId); + jsonWriter.writeStringField("apiVersion", this.apiVersion); + jsonWriter.writeStringField("callbackUrl", this.callbackUrl); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of EdgeSolutionVersionPublishedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of EdgeSolutionVersionPublishedEventData if the JsonReader was pointing to an instance of it, + * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the EdgeSolutionVersionPublishedEventData. + */ + @Generated + public static EdgeSolutionVersionPublishedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String externalValidationId = null; + String targetId = null; + String solutionTemplateId = null; + String solutionTemplateVersionId = null; + String solutionVersionId = null; + String apiVersion = null; + String callbackUrl = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("externalValidationId".equals(fieldName)) { + externalValidationId = reader.getString(); + } else if ("targetId".equals(fieldName)) { + targetId = reader.getString(); + } else if ("solutionTemplateId".equals(fieldName)) { + solutionTemplateId = reader.getString(); + } else if ("solutionTemplateVersionId".equals(fieldName)) { + solutionTemplateVersionId = reader.getString(); + } else if ("solutionVersionId".equals(fieldName)) { + solutionVersionId = reader.getString(); + } else if ("apiVersion".equals(fieldName)) { + apiVersion = reader.getString(); + } else if ("callbackUrl".equals(fieldName)) { + callbackUrl = reader.getString(); + } else { + reader.skipChildren(); + } + } + return new EdgeSolutionVersionPublishedEventData(externalValidationId, targetId, solutionTemplateId, + solutionTemplateVersionId, solutionVersionId, apiVersion, callbackUrl); + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEnteredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEnteredEventData.java index c19e4912777c..d54706da90c7 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEnteredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEnteredEventData.java @@ -17,18 +17,69 @@ */ @Immutable public final class MapsGeofenceEnteredEventData extends MapsGeofenceEventProperties { + /* + * Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. + */ + @Generated + private List invalidPeriodGeofenceGeometryId; + + /* + * Lists the fence geometries that either fully contain the coordinate position or have an overlap with the + * searchBuffer around the fence. + */ + @Generated + private List geometries; + + /* + * Lists of the geometry ID of the geofence which is expired relative to the user time in the request. + */ + @Generated + private List expiredGeofenceGeometryId; + /** * Creates an instance of MapsGeofenceEnteredEventData class. * - * @param expiredGeofenceGeometryId the expiredGeofenceGeometryId value to set. - * @param geometries the geometries value to set. - * @param invalidPeriodGeofenceGeometryId the invalidPeriodGeofenceGeometryId value to set. * @param isEventPublished the isEventPublished value to set. */ @Generated - private MapsGeofenceEnteredEventData(List expiredGeofenceGeometryId, List geometries, - List invalidPeriodGeofenceGeometryId, boolean isEventPublished) { - super(expiredGeofenceGeometryId, geometries, invalidPeriodGeofenceGeometryId, isEventPublished); + private MapsGeofenceEnteredEventData(boolean isEventPublished) { + super(isEventPublished); + } + + /** + * Get the invalidPeriodGeofenceGeometryId property: Lists of the geometry ID of the geofence which is in invalid + * period relative to the user time in the request. + * + * @return the invalidPeriodGeofenceGeometryId value. + */ + @Generated + @Override + public List getInvalidPeriodGeofenceGeometryId() { + return this.invalidPeriodGeofenceGeometryId; + } + + /** + * Get the geometries property: Lists the fence geometries that either fully contain the coordinate position or have + * an overlap with the searchBuffer around the fence. + * + * @return the geometries value. + */ + @Generated + @Override + public List getGeometries() { + return this.geometries; + } + + /** + * Get the expiredGeofenceGeometryId property: Lists of the geometry ID of the geofence which is expired relative to + * the user time in the request. + * + * @return the expiredGeofenceGeometryId value. + */ + @Generated + @Override + public List getExpiredGeofenceGeometryId() { + return this.expiredGeofenceGeometryId; } /** @@ -38,11 +89,6 @@ private MapsGeofenceEnteredEventData(List expiredGeofenceGeometryId, Lis @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("expiredGeofenceGeometryId", getExpiredGeofenceGeometryId(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("geometries", getGeometries(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("invalidPeriodGeofenceGeometryId", getInvalidPeriodGeofenceGeometryId(), - (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("isEventPublished", isEventPublished()); return jsonWriter.writeEndObject(); } @@ -79,8 +125,13 @@ public static MapsGeofenceEnteredEventData fromJson(JsonReader jsonReader) throw reader.skipChildren(); } } - return new MapsGeofenceEnteredEventData(expiredGeofenceGeometryId, geometries, - invalidPeriodGeofenceGeometryId, isEventPublished); + MapsGeofenceEnteredEventData deserializedMapsGeofenceEnteredEventData + = new MapsGeofenceEnteredEventData(isEventPublished); + deserializedMapsGeofenceEnteredEventData.expiredGeofenceGeometryId = expiredGeofenceGeometryId; + deserializedMapsGeofenceEnteredEventData.geometries = geometries; + deserializedMapsGeofenceEnteredEventData.invalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId; + + return deserializedMapsGeofenceEnteredEventData; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEventProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEventProperties.java index eca6f835a502..2fc5ed2a7361 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEventProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceEventProperties.java @@ -23,20 +23,20 @@ public class MapsGeofenceEventProperties implements JsonSerializable expiredGeofenceGeometryId; + private List expiredGeofenceGeometryId; /* * Lists the fence geometries that either fully contain the coordinate position or have an overlap with the * searchBuffer around the fence. */ @Generated - private final List geometries; + private List geometries; /* * Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. */ @Generated - private final List invalidPeriodGeofenceGeometryId; + private List invalidPeriodGeofenceGeometryId; /* * True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the @@ -48,17 +48,10 @@ public class MapsGeofenceEventProperties implements JsonSerializable expiredGeofenceGeometryId, List geometries, - List invalidPeriodGeofenceGeometryId, boolean isEventPublished) { - this.expiredGeofenceGeometryId = expiredGeofenceGeometryId; - this.geometries = geometries; - this.invalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId; + protected MapsGeofenceEventProperties(boolean isEventPublished) { this.isEventPublished = isEventPublished; } @@ -73,6 +66,19 @@ public List getExpiredGeofenceGeometryId() { return this.expiredGeofenceGeometryId; } + /** + * Set the expiredGeofenceGeometryId property: Lists of the geometry ID of the geofence which is expired relative to + * the user time in the request. + * + * @param expiredGeofenceGeometryId the expiredGeofenceGeometryId value to set. + * @return the MapsGeofenceEventProperties object itself. + */ + @Generated + MapsGeofenceEventProperties setExpiredGeofenceGeometryId(List expiredGeofenceGeometryId) { + this.expiredGeofenceGeometryId = expiredGeofenceGeometryId; + return this; + } + /** * Get the geometries property: Lists the fence geometries that either fully contain the coordinate position or have * an overlap with the searchBuffer around the fence. @@ -84,6 +90,19 @@ public List getGeometries() { return this.geometries; } + /** + * Set the geometries property: Lists the fence geometries that either fully contain the coordinate position or have + * an overlap with the searchBuffer around the fence. + * + * @param geometries the geometries value to set. + * @return the MapsGeofenceEventProperties object itself. + */ + @Generated + MapsGeofenceEventProperties setGeometries(List geometries) { + this.geometries = geometries; + return this; + } + /** * Get the invalidPeriodGeofenceGeometryId property: Lists of the geometry ID of the geofence which is in invalid * period relative to the user time in the request. @@ -95,6 +114,19 @@ public List getInvalidPeriodGeofenceGeometryId() { return this.invalidPeriodGeofenceGeometryId; } + /** + * Set the invalidPeriodGeofenceGeometryId property: Lists of the geometry ID of the geofence which is in invalid + * period relative to the user time in the request. + * + * @param invalidPeriodGeofenceGeometryId the invalidPeriodGeofenceGeometryId value to set. + * @return the MapsGeofenceEventProperties object itself. + */ + @Generated + MapsGeofenceEventProperties setInvalidPeriodGeofenceGeometryId(List invalidPeriodGeofenceGeometryId) { + this.invalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId; + return this; + } + /** * Get the isEventPublished property: True if at least one event is published to the Azure Maps event subscriber, * false if no event is published to the Azure Maps event subscriber. @@ -113,11 +145,6 @@ public boolean isEventPublished() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("expiredGeofenceGeometryId", this.expiredGeofenceGeometryId, - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("geometries", this.geometries, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("invalidPeriodGeofenceGeometryId", this.invalidPeriodGeofenceGeometryId, - (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("isEventPublished", this.isEventPublished); return jsonWriter.writeEndObject(); } @@ -154,8 +181,13 @@ public static MapsGeofenceEventProperties fromJson(JsonReader jsonReader) throws reader.skipChildren(); } } - return new MapsGeofenceEventProperties(expiredGeofenceGeometryId, geometries, - invalidPeriodGeofenceGeometryId, isEventPublished); + MapsGeofenceEventProperties deserializedMapsGeofenceEventProperties + = new MapsGeofenceEventProperties(isEventPublished); + deserializedMapsGeofenceEventProperties.expiredGeofenceGeometryId = expiredGeofenceGeometryId; + deserializedMapsGeofenceEventProperties.geometries = geometries; + deserializedMapsGeofenceEventProperties.invalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId; + + return deserializedMapsGeofenceEventProperties; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceExitedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceExitedEventData.java index e2a2a5641235..c0897b9cc1da 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceExitedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceExitedEventData.java @@ -17,18 +17,69 @@ */ @Immutable public final class MapsGeofenceExitedEventData extends MapsGeofenceEventProperties { + /* + * Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. + */ + @Generated + private List invalidPeriodGeofenceGeometryId; + + /* + * Lists the fence geometries that either fully contain the coordinate position or have an overlap with the + * searchBuffer around the fence. + */ + @Generated + private List geometries; + + /* + * Lists of the geometry ID of the geofence which is expired relative to the user time in the request. + */ + @Generated + private List expiredGeofenceGeometryId; + /** * Creates an instance of MapsGeofenceExitedEventData class. * - * @param expiredGeofenceGeometryId the expiredGeofenceGeometryId value to set. - * @param geometries the geometries value to set. - * @param invalidPeriodGeofenceGeometryId the invalidPeriodGeofenceGeometryId value to set. * @param isEventPublished the isEventPublished value to set. */ @Generated - private MapsGeofenceExitedEventData(List expiredGeofenceGeometryId, List geometries, - List invalidPeriodGeofenceGeometryId, boolean isEventPublished) { - super(expiredGeofenceGeometryId, geometries, invalidPeriodGeofenceGeometryId, isEventPublished); + private MapsGeofenceExitedEventData(boolean isEventPublished) { + super(isEventPublished); + } + + /** + * Get the invalidPeriodGeofenceGeometryId property: Lists of the geometry ID of the geofence which is in invalid + * period relative to the user time in the request. + * + * @return the invalidPeriodGeofenceGeometryId value. + */ + @Generated + @Override + public List getInvalidPeriodGeofenceGeometryId() { + return this.invalidPeriodGeofenceGeometryId; + } + + /** + * Get the geometries property: Lists the fence geometries that either fully contain the coordinate position or have + * an overlap with the searchBuffer around the fence. + * + * @return the geometries value. + */ + @Generated + @Override + public List getGeometries() { + return this.geometries; + } + + /** + * Get the expiredGeofenceGeometryId property: Lists of the geometry ID of the geofence which is expired relative to + * the user time in the request. + * + * @return the expiredGeofenceGeometryId value. + */ + @Generated + @Override + public List getExpiredGeofenceGeometryId() { + return this.expiredGeofenceGeometryId; } /** @@ -38,11 +89,6 @@ private MapsGeofenceExitedEventData(List expiredGeofenceGeometryId, List @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("expiredGeofenceGeometryId", getExpiredGeofenceGeometryId(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("geometries", getGeometries(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("invalidPeriodGeofenceGeometryId", getInvalidPeriodGeofenceGeometryId(), - (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("isEventPublished", isEventPublished()); return jsonWriter.writeEndObject(); } @@ -79,8 +125,13 @@ public static MapsGeofenceExitedEventData fromJson(JsonReader jsonReader) throws reader.skipChildren(); } } - return new MapsGeofenceExitedEventData(expiredGeofenceGeometryId, geometries, - invalidPeriodGeofenceGeometryId, isEventPublished); + MapsGeofenceExitedEventData deserializedMapsGeofenceExitedEventData + = new MapsGeofenceExitedEventData(isEventPublished); + deserializedMapsGeofenceExitedEventData.expiredGeofenceGeometryId = expiredGeofenceGeometryId; + deserializedMapsGeofenceExitedEventData.geometries = geometries; + deserializedMapsGeofenceExitedEventData.invalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId; + + return deserializedMapsGeofenceExitedEventData; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceResultEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceResultEventData.java index 7dbb69dd9378..def83df40fe1 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceResultEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MapsGeofenceResultEventData.java @@ -17,18 +17,69 @@ */ @Immutable public final class MapsGeofenceResultEventData extends MapsGeofenceEventProperties { + /* + * Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. + */ + @Generated + private List invalidPeriodGeofenceGeometryId; + + /* + * Lists the fence geometries that either fully contain the coordinate position or have an overlap with the + * searchBuffer around the fence. + */ + @Generated + private List geometries; + + /* + * Lists of the geometry ID of the geofence which is expired relative to the user time in the request. + */ + @Generated + private List expiredGeofenceGeometryId; + /** * Creates an instance of MapsGeofenceResultEventData class. * - * @param expiredGeofenceGeometryId the expiredGeofenceGeometryId value to set. - * @param geometries the geometries value to set. - * @param invalidPeriodGeofenceGeometryId the invalidPeriodGeofenceGeometryId value to set. * @param isEventPublished the isEventPublished value to set. */ @Generated - private MapsGeofenceResultEventData(List expiredGeofenceGeometryId, List geometries, - List invalidPeriodGeofenceGeometryId, boolean isEventPublished) { - super(expiredGeofenceGeometryId, geometries, invalidPeriodGeofenceGeometryId, isEventPublished); + private MapsGeofenceResultEventData(boolean isEventPublished) { + super(isEventPublished); + } + + /** + * Get the invalidPeriodGeofenceGeometryId property: Lists of the geometry ID of the geofence which is in invalid + * period relative to the user time in the request. + * + * @return the invalidPeriodGeofenceGeometryId value. + */ + @Generated + @Override + public List getInvalidPeriodGeofenceGeometryId() { + return this.invalidPeriodGeofenceGeometryId; + } + + /** + * Get the geometries property: Lists the fence geometries that either fully contain the coordinate position or have + * an overlap with the searchBuffer around the fence. + * + * @return the geometries value. + */ + @Generated + @Override + public List getGeometries() { + return this.geometries; + } + + /** + * Get the expiredGeofenceGeometryId property: Lists of the geometry ID of the geofence which is expired relative to + * the user time in the request. + * + * @return the expiredGeofenceGeometryId value. + */ + @Generated + @Override + public List getExpiredGeofenceGeometryId() { + return this.expiredGeofenceGeometryId; } /** @@ -38,11 +89,6 @@ private MapsGeofenceResultEventData(List expiredGeofenceGeometryId, List @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("expiredGeofenceGeometryId", getExpiredGeofenceGeometryId(), - (writer, element) -> writer.writeString(element)); - jsonWriter.writeArrayField("geometries", getGeometries(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeArrayField("invalidPeriodGeofenceGeometryId", getInvalidPeriodGeofenceGeometryId(), - (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("isEventPublished", isEventPublished()); return jsonWriter.writeEndObject(); } @@ -79,8 +125,13 @@ public static MapsGeofenceResultEventData fromJson(JsonReader jsonReader) throws reader.skipChildren(); } } - return new MapsGeofenceResultEventData(expiredGeofenceGeometryId, geometries, - invalidPeriodGeofenceGeometryId, isEventPublished); + MapsGeofenceResultEventData deserializedMapsGeofenceResultEventData + = new MapsGeofenceResultEventData(isEventPublished); + deserializedMapsGeofenceResultEventData.expiredGeofenceGeometryId = expiredGeofenceGeometryId; + deserializedMapsGeofenceResultEventData.geometries = geometries; + deserializedMapsGeofenceResultEventData.invalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId; + + return deserializedMapsGeofenceResultEventData; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ResourceNotificationsContainerServiceEventResourcesScheduledEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ResourceNotificationsContainerServiceEventResourcesScheduledEventData.java index 83b0d3d39972..ace8189e248f 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ResourceNotificationsContainerServiceEventResourcesScheduledEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ResourceNotificationsContainerServiceEventResourcesScheduledEventData.java @@ -13,6 +13,8 @@ /** * Schema of the Data property of an event grid event for a + * Microsoft.ResourceNotifications.ContainerServiceEventResources.ScheduledEventEmitted preview event.Schema of the Data + * property of an event grid event for a * Microsoft.ResourceNotifications.ContainerServiceEventResources.ScheduledEventEmitted preview event. */ @Immutable diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/resources/META-INF/azure-messaging-eventgrid_apiview_properties.json b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/resources/META-INF/azure-messaging-eventgrid_apiview_properties.json index 93d654c27f4f..2f79e00958fe 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/resources/META-INF/azure-messaging-eventgrid_apiview_properties.json +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/resources/META-INF/azure-messaging-eventgrid_apiview_properties.json @@ -3,6 +3,20 @@ "CrossLanguageDefinitionId": { "com.azure.messaging.eventgrid.implementation.models.AcsMessageChannelEventError": "Microsoft.EventGrid.SystemEvents.AcsMessageChannelEventError", "com.azure.messaging.eventgrid.implementation.models.AcsRouterCommunicationError": "Microsoft.EventGrid.SystemEvents.AcsRouterCommunicationError", + "com.azure.messaging.eventgrid.systemevents.AcsCallEndReasonProperties": "Microsoft.EventGrid.SystemEvents.AcsCallEndReasonProperties", + "com.azure.messaging.eventgrid.systemevents.AcsCallEndedByKind": "Microsoft.EventGrid.SystemEvents.AcsCallEndedByKind", + "com.azure.messaging.eventgrid.systemevents.AcsCallEndedByProperties": "Microsoft.EventGrid.SystemEvents.AcsCallEndedByProperties", + "com.azure.messaging.eventgrid.systemevents.AcsCallEndedEventData": "Microsoft.EventGrid.SystemEvents.AcsCallEndedEventData", + "com.azure.messaging.eventgrid.systemevents.AcsCallGroupProperties": "Microsoft.EventGrid.SystemEvents.AcsCallGroupProperties", + "com.azure.messaging.eventgrid.systemevents.AcsCallParticipantAddedEventData": "Microsoft.EventGrid.SystemEvents.AcsCallParticipantAddedEventData", + "com.azure.messaging.eventgrid.systemevents.AcsCallParticipantEventProperties": "Microsoft.EventGrid.SystemEvents.AcsCallParticipantEventProperties", + "com.azure.messaging.eventgrid.systemevents.AcsCallParticipantProperties": "Microsoft.EventGrid.SystemEvents.AcsCallParticipantProperties", + "com.azure.messaging.eventgrid.systemevents.AcsCallParticipantRemovedEventData": "Microsoft.EventGrid.SystemEvents.AcsCallParticipantRemovedEventData", + "com.azure.messaging.eventgrid.systemevents.AcsCallParticipantRoleKind": "Microsoft.EventGrid.SystemEvents.AcsCallParticipantRoleKind", + "com.azure.messaging.eventgrid.systemevents.AcsCallRoomProperties": "Microsoft.EventGrid.SystemEvents.AcsCallRoomProperties", + "com.azure.messaging.eventgrid.systemevents.AcsCallStartedEventData": "Microsoft.EventGrid.SystemEvents.AcsCallStartedEventData", + "com.azure.messaging.eventgrid.systemevents.AcsCallingEventProperties": "Microsoft.EventGrid.SystemEvents.AcsCallingEventProperties", + "com.azure.messaging.eventgrid.systemevents.AcsChatAzureBotCommandReceivedInThreadEventData": "Microsoft.EventGrid.SystemEvents.AcsChatAzureBotCommandReceivedInThreadEventData", "com.azure.messaging.eventgrid.systemevents.AcsChatEventBaseProperties": "Microsoft.EventGrid.SystemEvents.AcsChatEventBaseProperties", "com.azure.messaging.eventgrid.systemevents.AcsChatEventInThreadBaseProperties": "Microsoft.EventGrid.SystemEvents.AcsChatEventInThreadBaseProperties", "com.azure.messaging.eventgrid.systemevents.AcsChatMessageDeletedEventData": "Microsoft.EventGrid.SystemEvents.AcsChatMessageDeletedEventData", @@ -26,6 +40,7 @@ "com.azure.messaging.eventgrid.systemevents.AcsChatThreadPropertiesUpdatedEventData": "Microsoft.EventGrid.SystemEvents.AcsChatThreadPropertiesUpdatedEventData", "com.azure.messaging.eventgrid.systemevents.AcsChatThreadPropertiesUpdatedPerUserEventData": "Microsoft.EventGrid.SystemEvents.AcsChatThreadPropertiesUpdatedPerUserEventData", "com.azure.messaging.eventgrid.systemevents.AcsChatThreadWithUserDeletedEventData": "Microsoft.EventGrid.SystemEvents.AcsChatThreadWithUserDeletedEventData", + "com.azure.messaging.eventgrid.systemevents.AcsChatTypingIndicatorReceivedInThreadEventData": "Microsoft.EventGrid.SystemEvents.AcsChatTypingIndicatorReceivedInThreadEventData", "com.azure.messaging.eventgrid.systemevents.AcsEmailDeliveryReportReceivedEventData": "Microsoft.EventGrid.SystemEvents.AcsEmailDeliveryReportReceivedEventData", "com.azure.messaging.eventgrid.systemevents.AcsEmailDeliveryReportStatus": "Microsoft.EventGrid.SystemEvents.AcsEmailDeliveryReportStatus", "com.azure.messaging.eventgrid.systemevents.AcsEmailDeliveryReportStatusDetails": "Microsoft.EventGrid.SystemEvents.AcsEmailDeliveryReportStatusDetails", @@ -95,6 +110,10 @@ "com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseDeletedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementApiReleaseDeletedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseUpdatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementApiReleaseUpdatedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementApiUpdatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementApiUpdatedEventData", + "com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerClosedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementCircuitBreakerClosedEventData", + "com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerOpenedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementCircuitBreakerOpenedEventData", + "com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerProperties": "Microsoft.EventGrid.SystemEvents.ApiManagementCircuitBreakerProperties", + "com.azure.messaging.eventgrid.systemevents.ApiManagementExpiredGatewayTokenProperties": "Microsoft.EventGrid.SystemEvents.ApiManagementExpiredGatewayTokenProperties", "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayApiAddedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayApiAddedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayApiRemovedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayApiRemovedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayCertificateAuthorityCreatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayCertificateAuthorityCreatedEventData", @@ -105,7 +124,11 @@ "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationCreatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayHostnameConfigurationCreatedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationDeletedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayHostnameConfigurationDeletedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationUpdatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayHostnameConfigurationUpdatedEventData", + "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayProperties": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayProperties", + "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayTokenExpiredEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayTokenExpiredEventData", + "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayTokenNearExpiryEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayTokenNearExpiryEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayUpdatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementGatewayUpdatedEventData", + "com.azure.messaging.eventgrid.systemevents.ApiManagementNearExpiryGatewayTokenProperties": "Microsoft.EventGrid.SystemEvents.ApiManagementNearExpiryGatewayTokenProperties", "com.azure.messaging.eventgrid.systemevents.ApiManagementProductCreatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementProductCreatedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementProductDeletedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementProductDeletedEventData", "com.azure.messaging.eventgrid.systemevents.ApiManagementProductUpdatedEventData": "Microsoft.EventGrid.SystemEvents.ApiManagementProductUpdatedEventData", @@ -177,6 +200,7 @@ "com.azure.messaging.eventgrid.systemevents.DeviceTwinInfoX509Thumbprint": "Microsoft.EventGrid.SystemEvents.DeviceTwinInfoX509Thumbprint", "com.azure.messaging.eventgrid.systemevents.DeviceTwinMetadata": "Microsoft.EventGrid.SystemEvents.DeviceTwinMetadata", "com.azure.messaging.eventgrid.systemevents.DeviceTwinProperties": "Microsoft.EventGrid.SystemEvents.DeviceTwinProperties", + "com.azure.messaging.eventgrid.systemevents.EdgeSolutionVersionPublishedEventData": "Microsoft.EventGrid.SystemEvents.EdgeSolutionVersionPublishedEventData", "com.azure.messaging.eventgrid.systemevents.EventGridMqttClientCreatedOrUpdatedEventData": "Microsoft.EventGrid.SystemEvents.EventGridMQTTClientCreatedOrUpdatedEventData", "com.azure.messaging.eventgrid.systemevents.EventGridMqttClientDeletedEventData": "Microsoft.EventGrid.SystemEvents.EventGridMQTTClientDeletedEventData", "com.azure.messaging.eventgrid.systemevents.EventGridMqttClientDisconnectionReason": "Microsoft.EventGrid.SystemEvents.EventGridMQTTClientDisconnectionReason", diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml index 30acf0918f21..e5dad175e1e4 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml @@ -1,4 +1,4 @@ directory: specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents -commit: 6f175c9c006269a1d0f1928fbc768cacc6ac379a +commit: 5bd35e5887c166f9ec7a4755d3f8315f0083ad77 repo: Azure/azure-rest-api-specs additionalDirectories: diff --git a/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md index 5de64ca48be7..46be7e9534fd 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md @@ -1,14 +1,9 @@ # Release History -## 4.30.0-beta.1 (Unreleased) +## 4.30.0 (2025-05-16) ### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +- Added new values to `SystemEventNames` related to Azure Communication Services and Azure Edge. ## 4.29.1 (2025-03-24) diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 565612bb95a6..c303207b0631 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -12,7 +12,7 @@ com.azure azure-messaging-eventgrid - 4.30.0-beta.1 + 4.30.0 jar Microsoft Azure SDK for eventgrid diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java index 1d762bf3a67a..c049cefb9346 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java @@ -4,6 +4,11 @@ package com.azure.messaging.eventgrid; import com.azure.core.models.CloudEvent; +import com.azure.messaging.eventgrid.systemevents.AcsCallEndedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsCallParticipantAddedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsCallParticipantRemovedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsCallStartedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsChatAzureBotCommandReceivedInThreadEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatMemberAddedToThreadWithUserEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatMemberRemovedFromThreadWithUserEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatMessageDeletedEventData; @@ -22,6 +27,7 @@ import com.azure.messaging.eventgrid.systemevents.AcsChatThreadPropertiesUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatThreadPropertiesUpdatedPerUserEventData; import com.azure.messaging.eventgrid.systemevents.AcsChatThreadWithUserDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsChatTypingIndicatorReceivedInThreadEventData; import com.azure.messaging.eventgrid.systemevents.AcsEmailDeliveryReportReceivedEventData; import com.azure.messaging.eventgrid.systemevents.AcsEmailEngagementTrackingReportReceivedEventData; import com.azure.messaging.eventgrid.systemevents.AcsIncomingCallEventData; @@ -61,6 +67,8 @@ import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseDeletedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementApiUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerClosedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementCircuitBreakerOpenedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayApiAddedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayApiRemovedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayCertificateAuthorityCreatedEventData; @@ -71,6 +79,8 @@ import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationCreatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationDeletedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayHostnameConfigurationUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayTokenExpiredEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayTokenNearExpiryEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementGatewayUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementProductCreatedEventData; import com.azure.messaging.eventgrid.systemevents.ApiManagementProductDeletedEventData; @@ -239,6 +249,34 @@ * system events by their known string. */ public final class SystemEventNames { + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallEnded event. + */ + public static final String COMMUNICATION_CALL_ENDED = "Microsoft.Communication.CallEnded"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantAdded event. + */ + public static final String COMMUNICATION_CALL_PARTICIPANT_ADDED = "Microsoft.Communication.CallParticipantAdded"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantRemoved event. + */ + public static final String COMMUNICATION_CALL_PARTICIPANT_REMOVED + = "Microsoft.Communication.CallParticipantRemoved"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallStarted event. + */ + public static final String COMMUNICATION_CALL_STARTED = "Microsoft.Communication.CallStarted"; + + /** + * Schema of the Data property of an EventGridEvent for a + * Microsoft.Communication.ChatAzureBotCommandReceivedInThread event. + */ + public static final String COMMUNICATION_CHAT_AZURE_BOT_COMMAND_RECEIVED_IN_THREAD + = "Microsoft.Communication.ChatAzureBotCommandReceivedInThread"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageDeleted event. */ @@ -334,6 +372,13 @@ public final class SystemEventNames { public static final String COMMUNICATION_CHAT_THREAD_WITH_USER_DELETED = "Microsoft.Communication.ChatThreadWithUserDeleted"; + /** + * Schema of the Data property of an EventGridEvent for a + * Microsoft.Communication.ChatTypingIndicatorReceivedInThread event. + */ + public static final String COMMUNICATION_CHAT_TYPING_INDICATOR_RECEIVED_IN_THREAD + = "Microsoft.Communication.ChatTypingIndicatorReceivedInThread"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.EmailDeliveryReportReceived event. */ @@ -551,6 +596,16 @@ public final class SystemEventNames { */ public static final String API_MANAGEMENT_API_UPDATED = "Microsoft.ApiManagement.APIUpdated"; + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Closed event. + */ + public static final String API_MANAGEMENT_CIRCUIT_BREAKER_CLOSED = "Microsoft.ApiManagement.CircuitBreaker.Closed"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Opened event. + */ + public static final String API_MANAGEMENT_CIRCUIT_BREAKER_OPENED = "Microsoft.ApiManagement.CircuitBreaker.Opened"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayAPIAdded event. */ @@ -613,6 +668,17 @@ public final class SystemEventNames { public static final String API_MANAGEMENT_GATEWAY_HOSTNAME_CONFIGURATION_UPDATED = "Microsoft.ApiManagement.GatewayHostnameConfigurationUpdated"; + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenExpired event. + */ + public static final String API_MANAGEMENT_GATEWAY_TOKEN_EXPIRED = "Microsoft.ApiManagement.GatewayTokenExpired"; + + /** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenNearExpiry event. + */ + public static final String API_MANAGEMENT_GATEWAY_TOKEN_NEAR_EXPIRY + = "Microsoft.ApiManagement.GatewayTokenNearExpiry"; + /** * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayUpdated event. */ @@ -1482,6 +1548,12 @@ public final class SystemEventNames { = "Microsoft.Communication.ChatParticipantRemovedFromThreadWithUser"; private static final Map> SYSTEM_EVENT_MAPPINGS = new HashMap>() { { + put(COMMUNICATION_CALL_ENDED, AcsCallEndedEventData.class); + put(COMMUNICATION_CALL_PARTICIPANT_ADDED, AcsCallParticipantAddedEventData.class); + put(COMMUNICATION_CALL_PARTICIPANT_REMOVED, AcsCallParticipantRemovedEventData.class); + put(COMMUNICATION_CALL_STARTED, AcsCallStartedEventData.class); + put(COMMUNICATION_CHAT_AZURE_BOT_COMMAND_RECEIVED_IN_THREAD, + AcsChatAzureBotCommandReceivedInThreadEventData.class); put(COMMUNICATION_CHAT_MESSAGE_DELETED, AcsChatMessageDeletedEventData.class); put(COMMUNICATION_CHAT_MESSAGE_DELETED_IN_THREAD, AcsChatMessageDeletedInThreadEventData.class); put(COMMUNICATION_CHAT_MESSAGE_EDITED, AcsChatMessageEditedEventData.class); @@ -1501,6 +1573,8 @@ public final class SystemEventNames { put(COMMUNICATION_CHAT_THREAD_PROPERTIES_UPDATED_PER_USER, AcsChatThreadPropertiesUpdatedPerUserEventData.class); put(COMMUNICATION_CHAT_THREAD_WITH_USER_DELETED, AcsChatThreadWithUserDeletedEventData.class); + put(COMMUNICATION_CHAT_TYPING_INDICATOR_RECEIVED_IN_THREAD, + AcsChatTypingIndicatorReceivedInThreadEventData.class); put(COMMUNICATION_EMAIL_DELIVERY_REPORT_RECEIVED, AcsEmailDeliveryReportReceivedEventData.class); put(COMMUNICATION_EMAIL_ENGAGEMENT_TRACKING_REPORT_RECEIVED, AcsEmailEngagementTrackingReportReceivedEventData.class); @@ -1541,6 +1615,8 @@ public final class SystemEventNames { put(API_MANAGEMENT_API_RELEASE_DELETED, ApiManagementApiReleaseDeletedEventData.class); put(API_MANAGEMENT_API_RELEASE_UPDATED, ApiManagementApiReleaseUpdatedEventData.class); put(API_MANAGEMENT_API_UPDATED, ApiManagementApiUpdatedEventData.class); + put(API_MANAGEMENT_CIRCUIT_BREAKER_CLOSED, ApiManagementCircuitBreakerClosedEventData.class); + put(API_MANAGEMENT_CIRCUIT_BREAKER_OPENED, ApiManagementCircuitBreakerOpenedEventData.class); put(API_MANAGEMENT_GATEWAY_API_ADDED, ApiManagementGatewayApiAddedEventData.class); put(API_MANAGEMENT_GATEWAY_API_REMOVED, ApiManagementGatewayApiRemovedEventData.class); put(API_MANAGEMENT_GATEWAY_CERTIFICATE_AUTHORITY_CREATED, @@ -1557,6 +1633,8 @@ public final class SystemEventNames { ApiManagementGatewayHostnameConfigurationDeletedEventData.class); put(API_MANAGEMENT_GATEWAY_HOSTNAME_CONFIGURATION_UPDATED, ApiManagementGatewayHostnameConfigurationUpdatedEventData.class); + put(API_MANAGEMENT_GATEWAY_TOKEN_EXPIRED, ApiManagementGatewayTokenExpiredEventData.class); + put(API_MANAGEMENT_GATEWAY_TOKEN_NEAR_EXPIRY, ApiManagementGatewayTokenNearExpiryEventData.class); put(API_MANAGEMENT_GATEWAY_UPDATED, ApiManagementGatewayUpdatedEventData.class); put(API_MANAGEMENT_PRODUCT_CREATED, ApiManagementProductCreatedEventData.class); put(API_MANAGEMENT_PRODUCT_DELETED, ApiManagementProductDeletedEventData.class); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java new file mode 100644 index 000000000000..5a3cfd84a650 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java @@ -0,0 +1,141 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event reason properties. + */ +@Fluent +public final class AcsCallEndReasonProperties implements JsonSerializable { + /* + * Reason code for ending the call. + */ + private Integer code; + + /* + * Reason subcode for ending the call. + */ + private Integer subCode; + + /* + * Reason for ending the call. + */ + private String phrase; + + /** + * Creates an instance of AcsCallEndReasonProperties class. + */ + public AcsCallEndReasonProperties() { + } + + /** + * Get the code property: Reason code for ending the call. + * + * @return the code value. + */ + public Integer getCode() { + return this.code; + } + + /** + * Set the code property: Reason code for ending the call. + * + * @param code the code value to set. + * @return the AcsCallEndReasonProperties object itself. + */ + public AcsCallEndReasonProperties setCode(Integer code) { + this.code = code; + return this; + } + + /** + * Get the subCode property: Reason subcode for ending the call. + * + * @return the subCode value. + */ + public Integer getSubCode() { + return this.subCode; + } + + /** + * Set the subCode property: Reason subcode for ending the call. + * + * @param subCode the subCode value to set. + * @return the AcsCallEndReasonProperties object itself. + */ + public AcsCallEndReasonProperties setSubCode(Integer subCode) { + this.subCode = subCode; + return this; + } + + /** + * Get the phrase property: Reason for ending the call. + * + * @return the phrase value. + */ + public String getPhrase() { + return this.phrase; + } + + /** + * Set the phrase property: Reason for ending the call. + * + * @param phrase the phrase value to set. + * @return the AcsCallEndReasonProperties object itself. + */ + public AcsCallEndReasonProperties setPhrase(String phrase) { + this.phrase = phrase; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeNumberField("code", this.code); + jsonWriter.writeNumberField("subCode", this.subCode); + jsonWriter.writeStringField("phrase", this.phrase); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallEndReasonProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallEndReasonProperties if the JsonReader was pointing to an instance of it, or null if + * it was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallEndReasonProperties. + */ + public static AcsCallEndReasonProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallEndReasonProperties deserializedAcsCallEndReasonProperties = new AcsCallEndReasonProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("code".equals(fieldName)) { + deserializedAcsCallEndReasonProperties.code = reader.getNullable(JsonReader::getInt); + } else if ("subCode".equals(fieldName)) { + deserializedAcsCallEndReasonProperties.subCode = reader.getNullable(JsonReader::getInt); + } else if ("phrase".equals(fieldName)) { + deserializedAcsCallEndReasonProperties.phrase = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallEndReasonProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java new file mode 100644 index 000000000000..a1f69feb869c --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java @@ -0,0 +1,51 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * The type of the call ended by. + */ +public final class AcsCallEndedByKind extends ExpandableStringEnum { + /** + * Call end initiator is a participant. + */ + public static final AcsCallEndedByKind PARTICIPANT = fromString("Participant"); + + /** + * Call end initiator is the local participant. + */ + public static final AcsCallEndedByKind MICROSOFT_INTERNAL = fromString("MicrosoftInternal"); + + /** + * Creates a new instance of AcsCallEndedByKind value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Deprecated + public AcsCallEndedByKind() { + } + + /** + * Creates or finds a AcsCallEndedByKind from its string representation. + * + * @param name a name to look for. + * @return the corresponding AcsCallEndedByKind. + */ + public static AcsCallEndedByKind fromString(String name) { + return fromString(name, AcsCallEndedByKind.class); + } + + /** + * Gets known AcsCallEndedByKind values. + * + * @return known AcsCallEndedByKind values. + */ + public static Collection values() { + return values(AcsCallEndedByKind.class); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java new file mode 100644 index 000000000000..5f35627fd3cc --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java @@ -0,0 +1,142 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event endedby properties. + */ +@Fluent +public final class AcsCallEndedByProperties implements JsonSerializable { + /* + * The communication identifier of the call ended by + */ + private CommunicationIdentifierModel communicationIdentifier; + + /* + * The type of the call ended by. + */ + private AcsCallEndedByKind kind; + + /* + * The name of the call ended by. + */ + private String name; + + /** + * Creates an instance of AcsCallEndedByProperties class. + */ + public AcsCallEndedByProperties() { + } + + /** + * Get the communicationIdentifier property: The communication identifier of the call ended by. + * + * @return the communicationIdentifier value. + */ + public CommunicationIdentifierModel getCommunicationIdentifier() { + return this.communicationIdentifier; + } + + /** + * Set the communicationIdentifier property: The communication identifier of the call ended by. + * + * @param communicationIdentifier the communicationIdentifier value to set. + * @return the AcsCallEndedByProperties object itself. + */ + public AcsCallEndedByProperties setCommunicationIdentifier(CommunicationIdentifierModel communicationIdentifier) { + this.communicationIdentifier = communicationIdentifier; + return this; + } + + /** + * Get the kind property: The type of the call ended by. + * + * @return the kind value. + */ + public AcsCallEndedByKind getKind() { + return this.kind; + } + + /** + * Set the kind property: The type of the call ended by. + * + * @param kind the kind value to set. + * @return the AcsCallEndedByProperties object itself. + */ + public AcsCallEndedByProperties setKind(AcsCallEndedByKind kind) { + this.kind = kind; + return this; + } + + /** + * Get the name property: The name of the call ended by. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + * Set the name property: The name of the call ended by. + * + * @param name the name value to set. + * @return the AcsCallEndedByProperties object itself. + */ + public AcsCallEndedByProperties setName(String name) { + this.name = name; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("communicationIdentifier", this.communicationIdentifier); + jsonWriter.writeStringField("type", this.kind == null ? null : this.kind.toString()); + jsonWriter.writeStringField("name", this.name); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallEndedByProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallEndedByProperties if the JsonReader was pointing to an instance of it, or null if + * it was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallEndedByProperties. + */ + public static AcsCallEndedByProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallEndedByProperties deserializedAcsCallEndedByProperties = new AcsCallEndedByProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("communicationIdentifier".equals(fieldName)) { + deserializedAcsCallEndedByProperties.communicationIdentifier + = CommunicationIdentifierModel.fromJson(reader); + } else if ("type".equals(fieldName)) { + deserializedAcsCallEndedByProperties.kind = AcsCallEndedByKind.fromString(reader.getString()); + } else if ("name".equals(fieldName)) { + deserializedAcsCallEndedByProperties.name = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallEndedByProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java new file mode 100644 index 000000000000..ed68691c2d8f --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java @@ -0,0 +1,231 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.Duration; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallEnded event. + */ +@Fluent +public final class AcsCallEndedEventData extends AcsCallingEventProperties { + + /* + * The communication identifier of the user who was disconnected + */ + private AcsCallEndedByProperties endedBy; + + /* + * The reason for ending the call. + */ + private AcsCallEndReasonProperties reason; + + /* + * Duration of the call in seconds. + */ + private Float callDurationInSeconds; + + /** + * Creates an instance of AcsCallEndedEventData class. + */ + public AcsCallEndedEventData() { + } + + /** + * Get the endedBy property: The communication identifier of the user who was disconnected. + * + * @return the endedBy value. + */ + public AcsCallEndedByProperties getEndedBy() { + return this.endedBy; + } + + /** + * Set the endedBy property: The communication identifier of the user who was disconnected. + * + * @param endedBy the endedBy value to set. + * @return the AcsCallEndedEventData object itself. + */ + public AcsCallEndedEventData setEndedBy(AcsCallEndedByProperties endedBy) { + this.endedBy = endedBy; + return this; + } + + /** + * Get the reason property: The reason for ending the call. + * + * @return the reason value. + */ + public AcsCallEndReasonProperties getReason() { + return this.reason; + } + + /** + * Set the reason property: The reason for ending the call. + * + * @param reason the reason value to set. + * @return the AcsCallEndedEventData object itself. + */ + public AcsCallEndedEventData setReason(AcsCallEndReasonProperties reason) { + this.reason = reason; + return this; + } + + /** + * Get the callDuration property:Duration of the call in seconds. + * + * @return the callDuration value. + */ + public Duration getCallDuration() { + if (this.callDurationInSeconds != null) { + return Duration.ofNanos((long) (this.callDurationInSeconds * 1000_000_000L)); + } + return null; + } + + /** + * Set the callDuration property: Duration of the call in seconds. + * + * @param callDuration the callDuration value to set. + * @return the AcsCallEndedEventData object itself. + */ + public AcsCallEndedEventData setCallDuration(Duration callDuration) { + if (callDuration != null) { + this.callDurationInSeconds = callDuration.toNanos() / 1_000_000_000f; + } else { + this.callDurationInSeconds = null; + } + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setStartedBy(AcsCallParticipantProperties startedBy) { + super.setStartedBy(startedBy); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setServerCallId(String serverCallId) { + super.setServerCallId(serverCallId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setGroup(AcsCallGroupProperties group) { + super.setGroup(group); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setRoom(AcsCallRoomProperties room) { + super.setRoom(room); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setIsTwoParty(Boolean isTwoParty) { + super.setIsTwoParty(isTwoParty); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setCorrelationId(String correlationId) { + super.setCorrelationId(correlationId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallEndedEventData setIsRoomsCall(Boolean isRoomsCall) { + super.setIsRoomsCall(isRoomsCall); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("endedBy", this.endedBy); + jsonWriter.writeJsonField("reason", this.reason); + jsonWriter.writeNumberField("callDurationInSeconds", this.callDurationInSeconds); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallEndedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallEndedEventData if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallEndedEventData. + */ + public static AcsCallEndedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallEndedEventData deserializedAcsCallEndedEventData = new AcsCallEndedEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + if ("startedBy".equals(fieldName)) { + deserializedAcsCallEndedEventData.setStartedBy(AcsCallParticipantProperties.fromJson(reader)); + } else if ("serverCallId".equals(fieldName)) { + deserializedAcsCallEndedEventData.setServerCallId(reader.getString()); + } else if ("correlationId".equals(fieldName)) { + deserializedAcsCallEndedEventData.setCorrelationId(reader.getString()); + } else if ("group".equals(fieldName)) { + deserializedAcsCallEndedEventData.setGroup(AcsCallGroupProperties.fromJson(reader)); + } else if ("room".equals(fieldName)) { + deserializedAcsCallEndedEventData.setRoom(AcsCallRoomProperties.fromJson(reader)); + } else if ("isTwoParty".equals(fieldName)) { + deserializedAcsCallEndedEventData.setIsTwoParty(reader.getNullable(JsonReader::getBoolean)); + } else if ("isRoomsCall".equals(fieldName)) { + deserializedAcsCallEndedEventData.setIsRoomsCall(reader.getNullable(JsonReader::getBoolean)); + } else if ("endedBy".equals(fieldName)) { + deserializedAcsCallEndedEventData.endedBy = AcsCallEndedByProperties.fromJson(reader); + } else if ("reason".equals(fieldName)) { + deserializedAcsCallEndedEventData.reason = AcsCallEndReasonProperties.fromJson(reader); + } else if ("callDurationInSeconds".equals(fieldName)) { + deserializedAcsCallEndedEventData.callDurationInSeconds = reader.getNullable(JsonReader::getFloat); + } else { + reader.skipChildren(); + } + } + return deserializedAcsCallEndedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java new file mode 100644 index 000000000000..14455a130d45 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java @@ -0,0 +1,85 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event group properties. + */ +@Fluent +public final class AcsCallGroupProperties implements JsonSerializable { + /* + * Group Id. Format is Guid as string. + */ + private String id; + + /** + * Creates an instance of AcsCallGroupProperties class. + */ + public AcsCallGroupProperties() { + } + + /** + * Get the id property: Group Id. Format is Guid as string. + * + * @return the id value. + */ + public String getId() { + return this.id; + } + + /** + * Set the id property: Group Id. Format is Guid as string. + * + * @param id the id value to set. + * @return the AcsCallGroupProperties object itself. + */ + public AcsCallGroupProperties setId(String id) { + this.id = id; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("id", this.id); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallGroupProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallGroupProperties if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallGroupProperties. + */ + public static AcsCallGroupProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallGroupProperties deserializedAcsCallGroupProperties = new AcsCallGroupProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("id".equals(fieldName)) { + deserializedAcsCallGroupProperties.id = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallGroupProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java new file mode 100644 index 000000000000..ae4eec1d62dc --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java @@ -0,0 +1,193 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantAdded event. + */ +@Fluent +public final class AcsCallParticipantAddedEventData extends AcsCallParticipantEventData { + /** + * Creates an instance of AcsCallParticipantAddedEventData class. + */ + public AcsCallParticipantAddedEventData() { + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setUser(AcsCallParticipantProperties user) { + super.setUser(user); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setDisplayName(String displayName) { + super.setDisplayName(displayName); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setParticipantId(String participantId) { + super.setParticipantId(participantId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setUserAgent(String userAgent) { + super.setUserAgent(userAgent); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setStartedBy(AcsCallParticipantProperties startedBy) { + super.setStartedBy(startedBy); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setServerCallId(String serverCallId) { + super.setServerCallId(serverCallId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setGroup(AcsCallGroupProperties group) { + super.setGroup(group); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setRoom(AcsCallRoomProperties room) { + super.setRoom(room); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setIsTwoParty(Boolean isTwoParty) { + super.setIsTwoParty(isTwoParty); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setCorrelationId(String correlationId) { + super.setCorrelationId(correlationId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantAddedEventData setIsRoomsCall(Boolean isRoomsCall) { + super.setIsRoomsCall(isRoomsCall); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("user", getUser()); + jsonWriter.writeStringField("displayName", getDisplayName()); + jsonWriter.writeStringField("participantId", getParticipantId()); + jsonWriter.writeStringField("userAgent", getUserAgent()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantAddedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantAddedEventData if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallParticipantAddedEventData. + */ + public static AcsCallParticipantAddedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantAddedEventData deserializedAcsCallParticipantAddedEventData + = new AcsCallParticipantAddedEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData + .setStartedBy(AcsCallParticipantProperties.fromJson(reader)); + } else if ("serverCallId".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setServerCallId(reader.getString()); + } else if ("correlationId".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setCorrelationId(reader.getString()); + } else if ("group".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setGroup(AcsCallGroupProperties.fromJson(reader)); + } else if ("room".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setRoom(AcsCallRoomProperties.fromJson(reader)); + } else if ("isTwoParty".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData + .setIsTwoParty(reader.getNullable(JsonReader::getBoolean)); + } else if ("isRoomsCall".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData + .setIsRoomsCall(reader.getNullable(JsonReader::getBoolean)); + } else if ("user".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setUser(AcsCallParticipantProperties.fromJson(reader)); + } else if ("displayName".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setDisplayName(reader.getString()); + } else if ("participantId".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setParticipantId(reader.getString()); + } else if ("userAgent".equals(fieldName)) { + deserializedAcsCallParticipantAddedEventData.setUserAgent(reader.getString()); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallParticipantAddedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventData.java new file mode 100644 index 000000000000..2058ca739487 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventData.java @@ -0,0 +1,253 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of common properties of participant events. + */ +@Fluent +public class AcsCallParticipantEventData extends AcsCallingEventProperties { + /* + * The user of the call participant. + */ + private AcsCallParticipantProperties user; + + /* + * The display name of the participant. + */ + private String displayName; + + /* + * The Id of the participant. + */ + private String participantId; + + /* + * The user agent of the participant. + */ + private String userAgent; + + /** + * Creates an instance of AcsCallParticipantEventData class. + */ + public AcsCallParticipantEventData() { + } + + /** + * Get the user property: The user of the call participant. + * + * @return the user value. + */ + public AcsCallParticipantProperties getUser() { + return this.user; + } + + /** + * Set the user property: The user of the call participant. + * + * @param user the user value to set. + * @return the AcsCallParticipantEventData object itself. + */ + public AcsCallParticipantEventData setUser(AcsCallParticipantProperties user) { + this.user = user; + return this; + } + + /** + * Get the displayName property: The display name of the participant. + * + * @return the displayName value. + */ + public String getDisplayName() { + return this.displayName; + } + + /** + * Set the displayName property: The display name of the participant. + * + * @param displayName the displayName value to set. + * @return the AcsCallParticipantEventData object itself. + */ + public AcsCallParticipantEventData setDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + /** + * Get the participantId property: The Id of the participant. + * + * @return the participantId value. + */ + public String getParticipantId() { + return this.participantId; + } + + /** + * Set the participantId property: The Id of the participant. + * + * @param participantId the participantId value to set. + * @return the AcsCallParticipantEventData object itself. + */ + public AcsCallParticipantEventData setParticipantId(String participantId) { + this.participantId = participantId; + return this; + } + + /** + * Get the userAgent property: The user agent of the participant. + * + * @return the userAgent value. + */ + public String getUserAgent() { + return this.userAgent; + } + + /** + * Set the userAgent property: The user agent of the participant. + * + * @param userAgent the userAgent value to set. + * @return the AcsCallParticipantEventData object itself. + */ + public AcsCallParticipantEventData setUserAgent(String userAgent) { + this.userAgent = userAgent; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setStartedBy(AcsCallParticipantProperties startedBy) { + super.setStartedBy(startedBy); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setServerCallId(String serverCallId) { + super.setServerCallId(serverCallId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setGroup(AcsCallGroupProperties group) { + super.setGroup(group); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setRoom(AcsCallRoomProperties room) { + super.setRoom(room); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setIsTwoParty(Boolean isTwoParty) { + super.setIsTwoParty(isTwoParty); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setCorrelationId(String correlationId) { + super.setCorrelationId(correlationId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantEventData setIsRoomsCall(Boolean isRoomsCall) { + super.setIsRoomsCall(isRoomsCall); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("user", this.user); + jsonWriter.writeStringField("displayName", this.displayName); + jsonWriter.writeStringField("participantId", this.participantId); + jsonWriter.writeStringField("userAgent", this.userAgent); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantEventData if the JsonReader was pointing to an instance of it, or null + * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallParticipantEventData. + */ + public static AcsCallParticipantEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantEventData deserializedAcsCallParticipantEventData = new AcsCallParticipantEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setStartedBy(AcsCallParticipantProperties.fromJson(reader)); + } else if ("serverCallId".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setServerCallId(reader.getString()); + } else if ("correlationId".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setCorrelationId(reader.getString()); + } else if ("group".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setGroup(AcsCallGroupProperties.fromJson(reader)); + } else if ("room".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setRoom(AcsCallRoomProperties.fromJson(reader)); + } else if ("isTwoParty".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setIsTwoParty(reader.getNullable(JsonReader::getBoolean)); + } else if ("isRoomsCall".equals(fieldName)) { + deserializedAcsCallParticipantEventData.setIsRoomsCall(reader.getNullable(JsonReader::getBoolean)); + } else if ("user".equals(fieldName)) { + deserializedAcsCallParticipantEventData.user = AcsCallParticipantProperties.fromJson(reader); + } else if ("displayName".equals(fieldName)) { + deserializedAcsCallParticipantEventData.displayName = reader.getString(); + } else if ("participantId".equals(fieldName)) { + deserializedAcsCallParticipantEventData.participantId = reader.getString(); + } else if ("userAgent".equals(fieldName)) { + deserializedAcsCallParticipantEventData.userAgent = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallParticipantEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantKind.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantKind.java new file mode 100644 index 000000000000..86a4c1cd4214 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantKind.java @@ -0,0 +1,66 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * The role of participant user. + */ +public final class AcsCallParticipantKind extends ExpandableStringEnum { + /** + * Call participant role is an attendee. + */ + public static final AcsCallParticipantKind ATTENDEE = fromString("Attendee"); + + /** + * Call participant role is presenter. + */ + public static final AcsCallParticipantKind PRESENTER = fromString("Presenter"); + + /** + * Call participant role is consumer. + */ + public static final AcsCallParticipantKind CONSUMER = fromString("Consumer"); + + /** + * Call participant role is collaborator. + */ + public static final AcsCallParticipantKind COLLABORATOR = fromString("Collaborator"); + + /** + * Call participant role is organizer. + */ + public static final AcsCallParticipantKind ORGANIZER = fromString("Organizer"); + + /** + * Creates a new instance of AcsCallParticipantKind value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Deprecated + public AcsCallParticipantKind() { + } + + /** + * Creates or finds a AcsCallParticipantKind from its string representation. + * + * @param name a name to look for. + * @return the corresponding AcsCallParticipantKind. + */ + public static AcsCallParticipantKind fromString(String name) { + return fromString(name, AcsCallParticipantKind.class); + } + + /** + * Gets known AcsCallParticipantKind values. + * + * @return known AcsCallParticipantKind values. + */ + public static Collection values() { + return values(AcsCallParticipantKind.class); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java new file mode 100644 index 000000000000..41cacc0caa31 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java @@ -0,0 +1,116 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event participant user. + */ +@Fluent +public final class AcsCallParticipantProperties implements JsonSerializable { + /* + * The communication identifier of the call ended by + */ + private CommunicationIdentifierModel communicationIdentifier; + + /* + * The role of participant user. + */ + private AcsCallParticipantKind role; + + /** + * Creates an instance of AcsCallParticipantProperties class. + */ + public AcsCallParticipantProperties() { + } + + /** + * Get the communicationIdentifier property: The communication identifier of the call ended by. + * + * @return the communicationIdentifier value. + */ + public CommunicationIdentifierModel getCommunicationIdentifier() { + return this.communicationIdentifier; + } + + /** + * Set the communicationIdentifier property: The communication identifier of the call ended by. + * + * @param communicationIdentifier the communicationIdentifier value to set. + * @return the AcsCallParticipantProperties object itself. + */ + public AcsCallParticipantProperties + setCommunicationIdentifier(CommunicationIdentifierModel communicationIdentifier) { + this.communicationIdentifier = communicationIdentifier; + return this; + } + + /** + * Get the role property: The role of participant user. + * + * @return the role value. + */ + public AcsCallParticipantKind getRole() { + return this.role; + } + + /** + * Set the role property: The role of participant user. + * + * @param role the role value to set. + * @return the AcsCallParticipantProperties object itself. + */ + public AcsCallParticipantProperties setRole(AcsCallParticipantKind role) { + this.role = role; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("communicationIdentifier", this.communicationIdentifier); + jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantProperties if the JsonReader was pointing to an instance of it, or null + * if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallParticipantProperties. + */ + public static AcsCallParticipantProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantProperties deserializedAcsCallParticipantProperties = new AcsCallParticipantProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("communicationIdentifier".equals(fieldName)) { + deserializedAcsCallParticipantProperties.communicationIdentifier + = CommunicationIdentifierModel.fromJson(reader); + } else if ("role".equals(fieldName)) { + deserializedAcsCallParticipantProperties.role + = AcsCallParticipantKind.fromString(reader.getString()); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallParticipantProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java new file mode 100644 index 000000000000..2223bd3ca6b9 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java @@ -0,0 +1,194 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallParticipantRemoved event. + */ +@Fluent +public final class AcsCallParticipantRemovedEventData extends AcsCallParticipantEventData { + /** + * Creates an instance of AcsCallParticipantRemovedEventData class. + */ + public AcsCallParticipantRemovedEventData() { + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setUser(AcsCallParticipantProperties user) { + super.setUser(user); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setDisplayName(String displayName) { + super.setDisplayName(displayName); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setParticipantId(String participantId) { + super.setParticipantId(participantId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setUserAgent(String userAgent) { + super.setUserAgent(userAgent); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setStartedBy(AcsCallParticipantProperties startedBy) { + super.setStartedBy(startedBy); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setServerCallId(String serverCallId) { + super.setServerCallId(serverCallId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setGroup(AcsCallGroupProperties group) { + super.setGroup(group); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setRoom(AcsCallRoomProperties room) { + super.setRoom(room); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setIsTwoParty(Boolean isTwoParty) { + super.setIsTwoParty(isTwoParty); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setCorrelationId(String correlationId) { + super.setCorrelationId(correlationId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallParticipantRemovedEventData setIsRoomsCall(Boolean isRoomsCall) { + super.setIsRoomsCall(isRoomsCall); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + jsonWriter.writeJsonField("user", getUser()); + jsonWriter.writeStringField("displayName", getDisplayName()); + jsonWriter.writeStringField("participantId", getParticipantId()); + jsonWriter.writeStringField("userAgent", getUserAgent()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallParticipantRemovedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallParticipantRemovedEventData if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallParticipantRemovedEventData. + */ + public static AcsCallParticipantRemovedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallParticipantRemovedEventData deserializedAcsCallParticipantRemovedEventData + = new AcsCallParticipantRemovedEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData + .setStartedBy(AcsCallParticipantProperties.fromJson(reader)); + } else if ("serverCallId".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setServerCallId(reader.getString()); + } else if ("correlationId".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setCorrelationId(reader.getString()); + } else if ("group".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setGroup(AcsCallGroupProperties.fromJson(reader)); + } else if ("room".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setRoom(AcsCallRoomProperties.fromJson(reader)); + } else if ("isTwoParty".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData + .setIsTwoParty(reader.getNullable(JsonReader::getBoolean)); + } else if ("isRoomsCall".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData + .setIsRoomsCall(reader.getNullable(JsonReader::getBoolean)); + } else if ("user".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData + .setUser(AcsCallParticipantProperties.fromJson(reader)); + } else if ("displayName".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setDisplayName(reader.getString()); + } else if ("participantId".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setParticipantId(reader.getString()); + } else if ("userAgent".equals(fieldName)) { + deserializedAcsCallParticipantRemovedEventData.setUserAgent(reader.getString()); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallParticipantRemovedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java new file mode 100644 index 000000000000..9ae233097e67 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java @@ -0,0 +1,85 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of calling event room properties. + */ +@Fluent +public final class AcsCallRoomProperties implements JsonSerializable { + /* + * Room Id. Format is Guid as string. + */ + private String id; + + /** + * Creates an instance of AcsCallRoomProperties class. + */ + public AcsCallRoomProperties() { + } + + /** + * Get the id property: Room Id. Format is Guid as string. + * + * @return the id value. + */ + public String getId() { + return this.id; + } + + /** + * Set the id property: Room Id. Format is Guid as string. + * + * @param id the id value to set. + * @return the AcsCallRoomProperties object itself. + */ + public AcsCallRoomProperties setId(String id) { + this.id = id; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("id", this.id); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallRoomProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallRoomProperties if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IOException If an error occurs while reading the AcsCallRoomProperties. + */ + public static AcsCallRoomProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallRoomProperties deserializedAcsCallRoomProperties = new AcsCallRoomProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("id".equals(fieldName)) { + deserializedAcsCallRoomProperties.id = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallRoomProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java new file mode 100644 index 000000000000..75865e431619 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java @@ -0,0 +1,141 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.CallStarted event. + */ +@Fluent +public final class AcsCallStartedEventData extends AcsCallingEventProperties { + /** + * Creates an instance of AcsCallStartedEventData class. + */ + public AcsCallStartedEventData() { + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setStartedBy(AcsCallParticipantProperties startedBy) { + super.setStartedBy(startedBy); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setServerCallId(String serverCallId) { + super.setServerCallId(serverCallId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setGroup(AcsCallGroupProperties group) { + super.setGroup(group); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setRoom(AcsCallRoomProperties room) { + super.setRoom(room); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setIsTwoParty(Boolean isTwoParty) { + super.setIsTwoParty(isTwoParty); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setCorrelationId(String correlationId) { + super.setCorrelationId(correlationId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsCallStartedEventData setIsRoomsCall(Boolean isRoomsCall) { + super.setIsRoomsCall(isRoomsCall); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", getStartedBy()); + jsonWriter.writeStringField("serverCallId", getServerCallId()); + jsonWriter.writeStringField("correlationId", getCorrelationId()); + jsonWriter.writeJsonField("group", getGroup()); + jsonWriter.writeJsonField("room", getRoom()); + jsonWriter.writeBooleanField("isTwoParty", isTwoParty()); + jsonWriter.writeBooleanField("isRoomsCall", isRoomsCall()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallStartedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallStartedEventData if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallStartedEventData. + */ + public static AcsCallStartedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallStartedEventData deserializedAcsCallStartedEventData = new AcsCallStartedEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + deserializedAcsCallStartedEventData.setStartedBy(AcsCallParticipantProperties.fromJson(reader)); + } else if ("serverCallId".equals(fieldName)) { + deserializedAcsCallStartedEventData.setServerCallId(reader.getString()); + } else if ("correlationId".equals(fieldName)) { + deserializedAcsCallStartedEventData.setCorrelationId(reader.getString()); + } else if ("group".equals(fieldName)) { + deserializedAcsCallStartedEventData.setGroup(AcsCallGroupProperties.fromJson(reader)); + } else if ("room".equals(fieldName)) { + deserializedAcsCallStartedEventData.setRoom(AcsCallRoomProperties.fromJson(reader)); + } else if ("isTwoParty".equals(fieldName)) { + deserializedAcsCallStartedEventData.setIsTwoParty(reader.getNullable(JsonReader::getBoolean)); + } else if ("isRoomsCall".equals(fieldName)) { + deserializedAcsCallStartedEventData.setIsRoomsCall(reader.getNullable(JsonReader::getBoolean)); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallStartedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java new file mode 100644 index 000000000000..9d626c98d803 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java @@ -0,0 +1,254 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of common properties of all calling events. + */ +@Fluent +public class AcsCallingEventProperties implements JsonSerializable { + /* + * The call participant who initiated the call. + */ + private AcsCallParticipantProperties startedBy; + + /* + * The callId of the server + */ + private String serverCallId; + + /* + * The group metadata + */ + private AcsCallGroupProperties group; + + /* + * The group metadata + */ + private AcsCallRoomProperties room; + + /* + * Is two-party in calling event. + */ + private Boolean isTwoParty; + + /* + * The correlation ID of the calling event + */ + private String correlationId; + + /* + * Is the calling event a room call. + */ + private Boolean isRoomsCall; + + /** + * Creates an instance of AcsCallingEventProperties class. + */ + public AcsCallingEventProperties() { + } + + /** + * Get the startedBy property: The call participant who initiated the call. + * + * @return the startedBy value. + */ + public AcsCallParticipantProperties getStartedBy() { + return this.startedBy; + } + + /** + * Set the startedBy property: The call participant who initiated the call. + * + * @param startedBy the startedBy value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setStartedBy(AcsCallParticipantProperties startedBy) { + this.startedBy = startedBy; + return this; + } + + /** + * Get the serverCallId property: The callId of the server. + * + * @return the serverCallId value. + */ + public String getServerCallId() { + return this.serverCallId; + } + + /** + * Set the serverCallId property: The callId of the server. + * + * @param serverCallId the serverCallId value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setServerCallId(String serverCallId) { + this.serverCallId = serverCallId; + return this; + } + + /** + * Get the group property: The group metadata. + * + * @return the group value. + */ + public AcsCallGroupProperties getGroup() { + return this.group; + } + + /** + * Set the group property: The group metadata. + * + * @param group the group value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setGroup(AcsCallGroupProperties group) { + this.group = group; + return this; + } + + /** + * Get the room property: The group metadata. + * + * @return the room value. + */ + public AcsCallRoomProperties getRoom() { + return this.room; + } + + /** + * Set the room property: The group metadata. + * + * @param room the room value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setRoom(AcsCallRoomProperties room) { + this.room = room; + return this; + } + + /** + * Get the isTwoParty property: Is two-party in calling event. + * + * @return the isTwoParty value. + */ + public Boolean isTwoParty() { + return this.isTwoParty; + } + + /** + * Set the isTwoParty property: Is two-party in calling event. + * + * @param isTwoParty the isTwoParty value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setIsTwoParty(Boolean isTwoParty) { + this.isTwoParty = isTwoParty; + return this; + } + + /** + * Get the correlationId property: The correlation ID of the calling event. + * + * @return the correlationId value. + */ + public String getCorrelationId() { + return this.correlationId; + } + + /** + * Set the correlationId property: The correlation ID of the calling event. + * + * @param correlationId the correlationId value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setCorrelationId(String correlationId) { + this.correlationId = correlationId; + return this; + } + + /** + * Get the isRoomsCall property: Is the calling event a room call. + * + * @return the isRoomsCall value. + */ + public Boolean isRoomsCall() { + return this.isRoomsCall; + } + + /** + * Set the isRoomsCall property: Is the calling event a room call. + * + * @param isRoomsCall the isRoomsCall value to set. + * @return the AcsCallingEventProperties object itself. + */ + public AcsCallingEventProperties setIsRoomsCall(Boolean isRoomsCall) { + this.isRoomsCall = isRoomsCall; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("startedBy", this.startedBy); + jsonWriter.writeStringField("serverCallId", this.serverCallId); + jsonWriter.writeStringField("correlationId", this.correlationId); + jsonWriter.writeJsonField("group", this.group); + jsonWriter.writeJsonField("room", this.room); + jsonWriter.writeBooleanField("isTwoParty", this.isTwoParty); + jsonWriter.writeBooleanField("isRoomsCall", this.isRoomsCall); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsCallingEventProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsCallingEventProperties if the JsonReader was pointing to an instance of it, or null if + * it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsCallingEventProperties. + */ + public static AcsCallingEventProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsCallingEventProperties deserializedAcsCallingEventProperties = new AcsCallingEventProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("startedBy".equals(fieldName)) { + deserializedAcsCallingEventProperties.startedBy = AcsCallParticipantProperties.fromJson(reader); + } else if ("serverCallId".equals(fieldName)) { + deserializedAcsCallingEventProperties.serverCallId = reader.getString(); + } else if ("correlationId".equals(fieldName)) { + deserializedAcsCallingEventProperties.correlationId = reader.getString(); + } else if ("group".equals(fieldName)) { + deserializedAcsCallingEventProperties.group = AcsCallGroupProperties.fromJson(reader); + } else if ("room".equals(fieldName)) { + deserializedAcsCallingEventProperties.room = AcsCallRoomProperties.fromJson(reader); + } else if ("isTwoParty".equals(fieldName)) { + deserializedAcsCallingEventProperties.isTwoParty = reader.getNullable(JsonReader::getBoolean); + } else if ("isRoomsCall".equals(fieldName)) { + deserializedAcsCallingEventProperties.isRoomsCall = reader.getNullable(JsonReader::getBoolean); + } else { + reader.skipChildren(); + } + } + + return deserializedAcsCallingEventProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java new file mode 100644 index 000000000000..2fc99c3daf52 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java @@ -0,0 +1,222 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatAzureBotCommandReceivedInThread + * event. + */ +@Fluent +public final class AcsChatAzureBotCommandReceivedInThreadEventData extends AcsChatMessageEventInThreadBaseProperties { + /* + * The body of the chat message + */ + private String messageBody; + + /* + * The chat message metadata + */ + private Map metadata; + + /** + * Creates an instance of AcsChatAzureBotCommandReceivedInThreadEventData class. + */ + public AcsChatAzureBotCommandReceivedInThreadEventData() { + } + + /** + * Get the messageBody property: The body of the chat message. + * + * @return the messageBody value. + */ + public String getMessageBody() { + return this.messageBody; + } + + /** + * Set the messageBody property: The body of the chat message. + * + * @param messageBody the messageBody value to set. + * @return the AcsChatAzureBotCommandReceivedInThreadEventData object itself. + */ + public AcsChatAzureBotCommandReceivedInThreadEventData setMessageBody(String messageBody) { + this.messageBody = messageBody; + return this; + } + + /** + * Get the metadata property: The chat message metadata. + * + * @return the metadata value. + */ + public Map getMetadata() { + return this.metadata; + } + + /** + * Set the metadata property: The chat message metadata. + * + * @param metadata the metadata value to set. + * @return the AcsChatAzureBotCommandReceivedInThreadEventData object itself. + */ + public AcsChatAzureBotCommandReceivedInThreadEventData setMetadata(Map metadata) { + this.metadata = metadata; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setMessageId(String messageId) { + super.setMessageId(messageId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData + setSenderCommunicationIdentifier(CommunicationIdentifierModel senderCommunicationIdentifier) { + super.setSenderCommunicationIdentifier(senderCommunicationIdentifier); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setSenderDisplayName(String senderDisplayName) { + super.setSenderDisplayName(senderDisplayName); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setComposeTime(OffsetDateTime composeTime) { + super.setComposeTime(composeTime); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setType(String type) { + super.setType(type); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setVersion(Long version) { + super.setVersion(version); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setTransactionId(String transactionId) { + super.setTransactionId(transactionId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatAzureBotCommandReceivedInThreadEventData setThreadId(String threadId) { + super.setThreadId(threadId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("transactionId", getTransactionId()); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); + jsonWriter.writeStringField("composeTime", + getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeNumberField("version", getVersion()); + jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsChatAzureBotCommandReceivedInThreadEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsChatAzureBotCommandReceivedInThreadEventData if the JsonReader was pointing to an + * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsChatAzureBotCommandReceivedInThreadEventData. + */ + public static AcsChatAzureBotCommandReceivedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsChatAzureBotCommandReceivedInThreadEventData deserializedAcsChatAzureBotCommandReceivedInThreadEventData + = new AcsChatAzureBotCommandReceivedInThreadEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("transactionId".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.setTransactionId(reader.getString()); + } else if ("threadId".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.setThreadId(reader.getString()); + } else if ("messageId".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.setMessageId(reader.getString()); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData + .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.setType(reader.getString()); + } else if ("senderDisplayName".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData + .setSenderDisplayName(reader.getString()); + } else if ("composeTime".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.setComposeTime(reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); + } else if ("version".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData + .setVersion(reader.getNullable(JsonReader::getLong)); + } else if ("messageBody".equals(fieldName)) { + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + Map metadata = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsChatAzureBotCommandReceivedInThreadEventData.metadata = metadata; + } else { + reader.skipChildren(); + } + } + + return deserializedAcsChatAzureBotCommandReceivedInThreadEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java index 484b8d96395d..80187b8c142a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatEventInThreadBaseProperties.java @@ -89,6 +89,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatEventInThreadBaseProperties if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatEventInThreadBaseProperties. */ public static AcsChatEventInThreadBaseProperties fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java index a9eccda1686f..64ea109c79a7 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedEventData.java @@ -138,15 +138,15 @@ public AcsChatMessageDeletedEventData setThreadId(String threadId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); - jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); - jsonWriter.writeStringField("type", getType()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("deleteTime", this.deleteTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deleteTime)); @@ -159,6 +159,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageDeletedEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageDeletedEventData. */ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -169,25 +170,25 @@ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) thr String fieldName = reader.getFieldName(); reader.nextToken(); - if ("recipientCommunicationIdentifier".equals(fieldName)) { + if ("messageId".equals(fieldName)) { + deserializedAcsChatMessageDeletedEventData.setMessageId(reader.getString()); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + deserializedAcsChatMessageDeletedEventData + .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageDeletedEventData.setType(reader.getString()); + } else if ("recipientCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageDeletedEventData .setRecipientCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); } else if ("transactionId".equals(fieldName)) { deserializedAcsChatMessageDeletedEventData.setTransactionId(reader.getString()); } else if ("threadId".equals(fieldName)) { deserializedAcsChatMessageDeletedEventData.setThreadId(reader.getString()); - } else if ("messageId".equals(fieldName)) { - deserializedAcsChatMessageDeletedEventData.setMessageId(reader.getString()); - } else if ("senderCommunicationIdentifier".equals(fieldName)) { - deserializedAcsChatMessageDeletedEventData - .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageDeletedEventData.setSenderDisplayName(reader.getString()); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageDeletedEventData.setComposeTime(reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageDeletedEventData.setType(reader.getString()); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageDeletedEventData.setVersion(reader.getNullable(JsonReader::getLong)); } else if ("deleteTime".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java index 4e363da8b1ec..6a02fcaac01b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageDeletedInThreadEventData.java @@ -132,10 +132,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); - jsonWriter.writeStringField("type", getType()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("deleteTime", this.deleteTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deleteTime)); @@ -148,6 +148,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageDeletedInThreadEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageDeletedInThreadEventData. */ public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { @@ -167,13 +168,13 @@ public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonRea } else if ("senderCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageDeletedInThreadEventData .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageDeletedInThreadEventData.setType(reader.getString()); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageDeletedInThreadEventData.setSenderDisplayName(reader.getString()); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageDeletedInThreadEventData.setComposeTime(reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageDeletedInThreadEventData.setType(reader.getString()); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageDeletedInThreadEventData .setVersion(reader.getNullable(JsonReader::getLong)); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java index 55533cc3e993..8bd2aaed5f20 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedEventData.java @@ -189,15 +189,15 @@ public AcsChatMessageEditedEventData setThreadId(String threadId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); - jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); - jsonWriter.writeStringField("type", getType()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("messageBody", this.messageBody); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); @@ -212,6 +212,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageEditedEventData if the JsonReader was pointing to an instance of it, or null * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageEditedEventData. */ public static AcsChatMessageEditedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -222,25 +223,25 @@ public static AcsChatMessageEditedEventData fromJson(JsonReader jsonReader) thro String fieldName = reader.getFieldName(); reader.nextToken(); - if ("recipientCommunicationIdentifier".equals(fieldName)) { + if ("messageId".equals(fieldName)) { + deserializedAcsChatMessageEditedEventData.setMessageId(reader.getString()); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + deserializedAcsChatMessageEditedEventData + .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageEditedEventData.setType(reader.getString()); + } else if ("recipientCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageEditedEventData .setRecipientCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); } else if ("transactionId".equals(fieldName)) { deserializedAcsChatMessageEditedEventData.setTransactionId(reader.getString()); } else if ("threadId".equals(fieldName)) { deserializedAcsChatMessageEditedEventData.setThreadId(reader.getString()); - } else if ("messageId".equals(fieldName)) { - deserializedAcsChatMessageEditedEventData.setMessageId(reader.getString()); - } else if ("senderCommunicationIdentifier".equals(fieldName)) { - deserializedAcsChatMessageEditedEventData - .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageEditedEventData.setSenderDisplayName(reader.getString()); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageEditedEventData.setComposeTime(reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageEditedEventData.setType(reader.getString()); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageEditedEventData.setVersion(reader.getNullable(JsonReader::getLong)); } else if ("messageBody".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java index 916f86bd154e..7ad9663dc46f 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEditedInThreadEventData.java @@ -183,10 +183,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); - jsonWriter.writeStringField("type", getType()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("messageBody", this.messageBody); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); @@ -201,6 +201,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageEditedInThreadEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageEditedInThreadEventData. */ public static AcsChatMessageEditedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { @@ -220,13 +221,13 @@ public static AcsChatMessageEditedInThreadEventData fromJson(JsonReader jsonRead } else if ("senderCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageEditedInThreadEventData .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageEditedInThreadEventData.setType(reader.getString()); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageEditedInThreadEventData.setSenderDisplayName(reader.getString()); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageEditedInThreadEventData.setComposeTime(reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageEditedInThreadEventData.setType(reader.getString()); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageEditedInThreadEventData .setVersion(reader.getNullable(JsonReader::getLong)); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java index 21f513b04e74..2b13d958fe91 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventBaseProperties.java @@ -214,10 +214,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("messageId", this.messageId); jsonWriter.writeJsonField("senderCommunicationIdentifier", this.senderCommunicationIdentifier); + jsonWriter.writeStringField("type", this.type); jsonWriter.writeStringField("senderDisplayName", this.senderDisplayName); jsonWriter.writeStringField("composeTime", this.composeTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.composeTime)); - jsonWriter.writeStringField("type", this.type); jsonWriter.writeNumberField("version", this.version); return jsonWriter.writeEndObject(); } @@ -228,6 +228,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageEventBaseProperties if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageEventBaseProperties. */ public static AcsChatMessageEventBaseProperties fromJson(JsonReader jsonReader) throws IOException { @@ -250,13 +251,13 @@ public static AcsChatMessageEventBaseProperties fromJson(JsonReader jsonReader) } else if ("senderCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageEventBaseProperties.senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageEventBaseProperties.type = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageEventBaseProperties.senderDisplayName = reader.getString(); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageEventBaseProperties.composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageEventBaseProperties.type = reader.getString(); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageEventBaseProperties.version = reader.getNullable(JsonReader::getLong); } else { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java index 26350bf02211..629f882cc7d7 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageEventInThreadBaseProperties.java @@ -203,10 +203,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("messageId", this.messageId); jsonWriter.writeJsonField("senderCommunicationIdentifier", this.senderCommunicationIdentifier); + jsonWriter.writeStringField("type", this.type); jsonWriter.writeStringField("senderDisplayName", this.senderDisplayName); jsonWriter.writeStringField("composeTime", this.composeTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.composeTime)); - jsonWriter.writeStringField("type", this.type); jsonWriter.writeNumberField("version", this.version); return jsonWriter.writeEndObject(); } @@ -217,6 +217,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageEventInThreadBaseProperties if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageEventInThreadBaseProperties. */ public static AcsChatMessageEventInThreadBaseProperties fromJson(JsonReader jsonReader) throws IOException { @@ -236,13 +237,13 @@ public static AcsChatMessageEventInThreadBaseProperties fromJson(JsonReader json } else if ("senderCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageEventInThreadBaseProperties.senderCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageEventInThreadBaseProperties.type = reader.getString(); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageEventInThreadBaseProperties.senderDisplayName = reader.getString(); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageEventInThreadBaseProperties.composeTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageEventInThreadBaseProperties.type = reader.getString(); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageEventInThreadBaseProperties.version = reader.getNullable(JsonReader::getLong); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java index 86809d27ccb0..aabe543218b3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedEventData.java @@ -164,15 +164,15 @@ public AcsChatMessageReceivedEventData setThreadId(String threadId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); jsonWriter.writeJsonField("recipientCommunicationIdentifier", getRecipientCommunicationIdentifier()); jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("messageId", getMessageId()); - jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); - jsonWriter.writeStringField("type", getType()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("messageBody", this.messageBody); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); @@ -185,6 +185,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageReceivedEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageReceivedEventData. */ public static AcsChatMessageReceivedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -195,25 +196,25 @@ public static AcsChatMessageReceivedEventData fromJson(JsonReader jsonReader) th String fieldName = reader.getFieldName(); reader.nextToken(); - if ("recipientCommunicationIdentifier".equals(fieldName)) { + if ("messageId".equals(fieldName)) { + deserializedAcsChatMessageReceivedEventData.setMessageId(reader.getString()); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + deserializedAcsChatMessageReceivedEventData + .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageReceivedEventData.setType(reader.getString()); + } else if ("recipientCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageReceivedEventData .setRecipientCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); } else if ("transactionId".equals(fieldName)) { deserializedAcsChatMessageReceivedEventData.setTransactionId(reader.getString()); } else if ("threadId".equals(fieldName)) { deserializedAcsChatMessageReceivedEventData.setThreadId(reader.getString()); - } else if ("messageId".equals(fieldName)) { - deserializedAcsChatMessageReceivedEventData.setMessageId(reader.getString()); - } else if ("senderCommunicationIdentifier".equals(fieldName)) { - deserializedAcsChatMessageReceivedEventData - .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageReceivedEventData.setSenderDisplayName(reader.getString()); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageReceivedEventData.setComposeTime(reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageReceivedEventData.setType(reader.getString()); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageReceivedEventData.setVersion(reader.getNullable(JsonReader::getLong)); } else if ("messageBody".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java index 987d8eb7d15f..61b723aa7c89 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatMessageReceivedInThreadEventData.java @@ -158,10 +158,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("threadId", getThreadId()); jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); jsonWriter.writeStringField("composeTime", getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); - jsonWriter.writeStringField("type", getType()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeStringField("messageBody", this.messageBody); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); @@ -174,6 +174,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatMessageReceivedInThreadEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatMessageReceivedInThreadEventData. */ public static AcsChatMessageReceivedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { @@ -193,13 +194,13 @@ public static AcsChatMessageReceivedInThreadEventData fromJson(JsonReader jsonRe } else if ("senderCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatMessageReceivedInThreadEventData .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatMessageReceivedInThreadEventData.setType(reader.getString()); } else if ("senderDisplayName".equals(fieldName)) { deserializedAcsChatMessageReceivedInThreadEventData.setSenderDisplayName(reader.getString()); } else if ("composeTime".equals(fieldName)) { deserializedAcsChatMessageReceivedInThreadEventData.setComposeTime(reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); - } else if ("type".equals(fieldName)) { - deserializedAcsChatMessageReceivedInThreadEventData.setType(reader.getString()); } else if ("version".equals(fieldName)) { deserializedAcsChatMessageReceivedInThreadEventData .setVersion(reader.getNullable(JsonReader::getLong)); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java index b4e740a0ab86..bbcbc74066bb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadEventData.java @@ -152,10 +152,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("time", - this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeJsonField("addedByCommunicationIdentifier", this.addedByCommunicationIdentifier); jsonWriter.writeJsonField("participantAdded", this.participantAdded); + jsonWriter.writeStringField("time", + this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeNumberField("version", this.version); return jsonWriter.writeEndObject(); } @@ -166,6 +166,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatParticipantAddedToThreadEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatParticipantAddedToThreadEventData. */ public static AcsChatParticipantAddedToThreadEventData fromJson(JsonReader jsonReader) throws IOException { @@ -180,15 +181,15 @@ public static AcsChatParticipantAddedToThreadEventData fromJson(JsonReader jsonR deserializedAcsChatParticipantAddedToThreadEventData.setTransactionId(reader.getString()); } else if ("threadId".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadEventData.setThreadId(reader.getString()); - } else if ("time".equals(fieldName)) { - deserializedAcsChatParticipantAddedToThreadEventData.time = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("addedByCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadEventData.addedByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("participantAdded".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadEventData.participantAdded = AcsChatThreadParticipantProperties.fromJson(reader); + } else if ("time".equals(fieldName)) { + deserializedAcsChatParticipantAddedToThreadEventData.time = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("version".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadEventData.version = reader.getNullable(JsonReader::getLong); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java index 111b978c26b0..47d9953d0aa0 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantAddedToThreadWithUserEventData.java @@ -160,10 +160,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeNumberField("version", getVersion()); - jsonWriter.writeStringField("time", - this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeJsonField("addedByCommunicationIdentifier", this.addedByCommunicationIdentifier); jsonWriter.writeJsonField("participantAdded", this.participantAdded); + jsonWriter.writeStringField("time", + this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); return jsonWriter.writeEndObject(); } @@ -173,6 +173,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatParticipantAddedToThreadWithUserEventData if the JsonReader was pointing to an * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatParticipantAddedToThreadWithUserEventData. */ public static AcsChatParticipantAddedToThreadWithUserEventData fromJson(JsonReader jsonReader) throws IOException { @@ -196,15 +197,15 @@ public static AcsChatParticipantAddedToThreadWithUserEventData fromJson(JsonRead } else if ("version".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadWithUserEventData .setVersion(reader.getNullable(JsonReader::getLong)); - } else if ("time".equals(fieldName)) { - deserializedAcsChatParticipantAddedToThreadWithUserEventData.time = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("addedByCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadWithUserEventData.addedByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("participantAdded".equals(fieldName)) { deserializedAcsChatParticipantAddedToThreadWithUserEventData.participantAdded = AcsChatThreadParticipantProperties.fromJson(reader); + } else if ("time".equals(fieldName)) { + deserializedAcsChatParticipantAddedToThreadWithUserEventData.time = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java index c4c8a9e47eb4..40d8a26509a1 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadEventData.java @@ -152,10 +152,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeStringField("threadId", getThreadId()); - jsonWriter.writeStringField("time", - this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeJsonField("removedByCommunicationIdentifier", this.removedByCommunicationIdentifier); jsonWriter.writeJsonField("participantRemoved", this.participantRemoved); + jsonWriter.writeStringField("time", + this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeNumberField("version", this.version); return jsonWriter.writeEndObject(); } @@ -166,6 +166,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatParticipantRemovedFromThreadEventData if the JsonReader was pointing to an instance * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatParticipantRemovedFromThreadEventData. */ public static AcsChatParticipantRemovedFromThreadEventData fromJson(JsonReader jsonReader) throws IOException { @@ -180,15 +181,15 @@ public static AcsChatParticipantRemovedFromThreadEventData fromJson(JsonReader j deserializedAcsChatParticipantRemovedFromThreadEventData.setTransactionId(reader.getString()); } else if ("threadId".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadEventData.setThreadId(reader.getString()); - } else if ("time".equals(fieldName)) { - deserializedAcsChatParticipantRemovedFromThreadEventData.time = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("removedByCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadEventData.removedByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("participantRemoved".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadEventData.participantRemoved = AcsChatThreadParticipantProperties.fromJson(reader); + } else if ("time".equals(fieldName)) { + deserializedAcsChatParticipantRemovedFromThreadEventData.time = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("version".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadEventData.version = reader.getNullable(JsonReader::getLong); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java index 9f3a0ca38762..f294820af8ea 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatParticipantRemovedFromThreadWithUserEventData.java @@ -160,10 +160,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("createTime", getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeNumberField("version", getVersion()); - jsonWriter.writeStringField("time", - this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); jsonWriter.writeJsonField("removedByCommunicationIdentifier", this.removedByCommunicationIdentifier); jsonWriter.writeJsonField("participantRemoved", this.participantRemoved); + jsonWriter.writeStringField("time", + this.time == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.time)); return jsonWriter.writeEndObject(); } @@ -173,6 +173,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatParticipantRemovedFromThreadWithUserEventData if the JsonReader was pointing to an * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatParticipantRemovedFromThreadWithUserEventData. */ public static AcsChatParticipantRemovedFromThreadWithUserEventData fromJson(JsonReader jsonReader) @@ -198,15 +199,15 @@ public static AcsChatParticipantRemovedFromThreadWithUserEventData fromJson(Json } else if ("version".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadWithUserEventData .setVersion(reader.getNullable(JsonReader::getLong)); - } else if ("time".equals(fieldName)) { - deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.time = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("removedByCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.removedByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); } else if ("participantRemoved".equals(fieldName)) { deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.participantRemoved = AcsChatThreadParticipantProperties.fromJson(reader); + } else if ("time".equals(fieldName)) { + deserializedAcsChatParticipantRemovedFromThreadWithUserEventData.time = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java index 09b2e5431734..3da2e7bc6540 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java @@ -178,8 +178,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier); jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element)); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("participants", this.participants, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -189,6 +189,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadCreatedEventData if the JsonReader was pointing to an instance of it, or null * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadCreatedEventData. */ public static AcsChatThreadCreatedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -214,13 +215,13 @@ public static AcsChatThreadCreatedEventData fromJson(JsonReader jsonReader) thro } else if ("properties".equals(fieldName)) { Map properties = reader.readMap(reader1 -> reader1.readUntyped()); deserializedAcsChatThreadCreatedEventData.properties = properties; - } else if ("metadata".equals(fieldName)) { - Map metadata = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsChatThreadCreatedEventData.metadata = metadata; } else if ("participants".equals(fieldName)) { List participants = reader.readArray(reader1 -> AcsChatThreadParticipantProperties.fromJson(reader1)); deserializedAcsChatThreadCreatedEventData.participants = participants; + } else if ("metadata".equals(fieldName)) { + Map metadata = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsChatThreadCreatedEventData.metadata = metadata; } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java index e8f0330006eb..da1807c361fa 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java @@ -190,8 +190,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier); jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element)); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("participants", this.participants, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -201,6 +201,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadCreatedWithUserEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadCreatedWithUserEventData. */ public static AcsChatThreadCreatedWithUserEventData fromJson(JsonReader jsonReader) throws IOException { @@ -230,13 +231,13 @@ public static AcsChatThreadCreatedWithUserEventData fromJson(JsonReader jsonRead } else if ("properties".equals(fieldName)) { Map properties = reader.readMap(reader1 -> reader1.readUntyped()); deserializedAcsChatThreadCreatedWithUserEventData.properties = properties; - } else if ("metadata".equals(fieldName)) { - Map metadata = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsChatThreadCreatedWithUserEventData.metadata = metadata; } else if ("participants".equals(fieldName)) { List participants = reader.readArray(reader1 -> AcsChatThreadParticipantProperties.fromJson(reader1)); deserializedAcsChatThreadCreatedWithUserEventData.participants = participants; + } else if ("metadata".equals(fieldName)) { + Map metadata = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsChatThreadCreatedWithUserEventData.metadata = metadata; } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java index 467d7e677d0e..a0d808de8364 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadDeletedEventData.java @@ -136,6 +136,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadDeletedEventData if the JsonReader was pointing to an instance of it, or null * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadDeletedEventData. */ public static AcsChatThreadDeletedEventData fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java index bc892040aa2c..5cb96a7e1715 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadEventInThreadBaseProperties.java @@ -112,6 +112,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadEventInThreadBaseProperties if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadEventInThreadBaseProperties. */ public static AcsChatThreadEventInThreadBaseProperties fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java index 0f080c4a1ce5..ebf1de54ae12 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadParticipantProperties.java @@ -105,8 +105,8 @@ public AcsChatThreadParticipantProperties setMetadata(Map metada @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("displayName", this.displayName); jsonWriter.writeJsonField("participantCommunicationIdentifier", this.participantCommunicationIdentifier); + jsonWriter.writeStringField("displayName", this.displayName); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -117,6 +117,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadParticipantProperties if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadParticipantProperties. */ public static AcsChatThreadParticipantProperties fromJson(JsonReader jsonReader) throws IOException { @@ -127,11 +128,11 @@ public static AcsChatThreadParticipantProperties fromJson(JsonReader jsonReader) String fieldName = reader.getFieldName(); reader.nextToken(); - if ("displayName".equals(fieldName)) { - deserializedAcsChatThreadParticipantProperties.displayName = reader.getString(); - } else if ("participantCommunicationIdentifier".equals(fieldName)) { + if ("participantCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatThreadParticipantProperties.participantCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("displayName".equals(fieldName)) { + deserializedAcsChatThreadParticipantProperties.displayName = reader.getString(); } else if ("metadata".equals(fieldName)) { Map metadata = reader.readMap(reader1 -> reader1.getString()); deserializedAcsChatThreadParticipantProperties.metadata = metadata; diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java index 441fc7d76d79..3bc19cee7048 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java @@ -176,10 +176,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier); - jsonWriter.writeStringField("editTime", - this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element)); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + jsonWriter.writeStringField("editTime", + this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); return jsonWriter.writeEndObject(); } @@ -189,6 +189,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadPropertiesUpdatedEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadPropertiesUpdatedEventData. */ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -212,15 +213,15 @@ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonRe } else if ("editedByCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatThreadPropertiesUpdatedEventData.editedByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); - } else if ("editTime".equals(fieldName)) { - deserializedAcsChatThreadPropertiesUpdatedEventData.editTime = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("properties".equals(fieldName)) { Map properties = reader.readMap(reader1 -> reader1.readUntyped()); deserializedAcsChatThreadPropertiesUpdatedEventData.properties = properties; } else if ("metadata".equals(fieldName)) { Map metadata = reader.readMap(reader1 -> reader1.getString()); deserializedAcsChatThreadPropertiesUpdatedEventData.metadata = metadata; + } else if ("editTime".equals(fieldName)) { + deserializedAcsChatThreadPropertiesUpdatedEventData.editTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java index e87c7a9d4341..4320410e2db3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java @@ -188,10 +188,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { getCreateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreateTime())); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element)); jsonWriter.writeStringField("editTime", this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeUntyped(element)); return jsonWriter.writeEndObject(); } @@ -201,6 +201,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadPropertiesUpdatedPerUserEventData if the JsonReader was pointing to an * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadPropertiesUpdatedPerUserEventData. */ public static AcsChatThreadPropertiesUpdatedPerUserEventData fromJson(JsonReader jsonReader) throws IOException { @@ -227,15 +228,15 @@ public static AcsChatThreadPropertiesUpdatedPerUserEventData fromJson(JsonReader } else if ("editedByCommunicationIdentifier".equals(fieldName)) { deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.editedByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader); + } else if ("properties".equals(fieldName)) { + Map properties = reader.readMap(reader1 -> reader1.readUntyped()); + deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.properties = properties; } else if ("editTime".equals(fieldName)) { deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.editTime = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("metadata".equals(fieldName)) { Map metadata = reader.readMap(reader1 -> reader1.getString()); deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.metadata = metadata; - } else if ("properties".equals(fieldName)) { - Map properties = reader.readMap(reader1 -> reader1.readUntyped()); - deserializedAcsChatThreadPropertiesUpdatedPerUserEventData.properties = properties; } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java index c45ca3c1f5a4..6868d7a78152 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadWithUserDeletedEventData.java @@ -147,6 +147,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsChatThreadWithUserDeletedEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsChatThreadWithUserDeletedEventData. */ public static AcsChatThreadWithUserDeletedEventData fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java new file mode 100644 index 000000000000..986e7157a521 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java @@ -0,0 +1,222 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatTypingIndicatorReceivedInThread + * event. + */ +@Fluent +public final class AcsChatTypingIndicatorReceivedInThreadEventData extends AcsChatMessageEventInThreadBaseProperties { + /* + * The body of the chat message + */ + private String messageBody; + + /* + * The chat message metadata + */ + private Map metadata; + + /** + * Creates an instance of AcsChatTypingIndicatorReceivedInThreadEventData class. + */ + public AcsChatTypingIndicatorReceivedInThreadEventData() { + } + + /** + * Get the messageBody property: The body of the chat message. + * + * @return the messageBody value. + */ + public String getMessageBody() { + return this.messageBody; + } + + /** + * Set the messageBody property: The body of the chat message. + * + * @param messageBody the messageBody value to set. + * @return the AcsChatTypingIndicatorReceivedInThreadEventData object itself. + */ + public AcsChatTypingIndicatorReceivedInThreadEventData setMessageBody(String messageBody) { + this.messageBody = messageBody; + return this; + } + + /** + * Get the metadata property: The chat message metadata. + * + * @return the metadata value. + */ + public Map getMetadata() { + return this.metadata; + } + + /** + * Set the metadata property: The chat message metadata. + * + * @param metadata the metadata value to set. + * @return the AcsChatTypingIndicatorReceivedInThreadEventData object itself. + */ + public AcsChatTypingIndicatorReceivedInThreadEventData setMetadata(Map metadata) { + this.metadata = metadata; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setMessageId(String messageId) { + super.setMessageId(messageId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData + setSenderCommunicationIdentifier(CommunicationIdentifierModel senderCommunicationIdentifier) { + super.setSenderCommunicationIdentifier(senderCommunicationIdentifier); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setSenderDisplayName(String senderDisplayName) { + super.setSenderDisplayName(senderDisplayName); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setComposeTime(OffsetDateTime composeTime) { + super.setComposeTime(composeTime); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setType(String type) { + super.setType(type); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setVersion(Long version) { + super.setVersion(version); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setTransactionId(String transactionId) { + super.setTransactionId(transactionId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AcsChatTypingIndicatorReceivedInThreadEventData setThreadId(String threadId) { + super.setThreadId(threadId); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("transactionId", getTransactionId()); + jsonWriter.writeStringField("threadId", getThreadId()); + jsonWriter.writeStringField("messageId", getMessageId()); + jsonWriter.writeJsonField("senderCommunicationIdentifier", getSenderCommunicationIdentifier()); + jsonWriter.writeStringField("type", getType()); + jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName()); + jsonWriter.writeStringField("composeTime", + getComposeTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getComposeTime())); + jsonWriter.writeNumberField("version", getVersion()); + jsonWriter.writeStringField("messageBody", this.messageBody); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of AcsChatTypingIndicatorReceivedInThreadEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of AcsChatTypingIndicatorReceivedInThreadEventData if the JsonReader was pointing to an + * instance of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the AcsChatTypingIndicatorReceivedInThreadEventData. + */ + public static AcsChatTypingIndicatorReceivedInThreadEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + AcsChatTypingIndicatorReceivedInThreadEventData deserializedAcsChatTypingIndicatorReceivedInThreadEventData + = new AcsChatTypingIndicatorReceivedInThreadEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("transactionId".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.setTransactionId(reader.getString()); + } else if ("threadId".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.setThreadId(reader.getString()); + } else if ("messageId".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.setMessageId(reader.getString()); + } else if ("senderCommunicationIdentifier".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData + .setSenderCommunicationIdentifier(CommunicationIdentifierModel.fromJson(reader)); + } else if ("type".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.setType(reader.getString()); + } else if ("senderDisplayName".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData + .setSenderDisplayName(reader.getString()); + } else if ("composeTime".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.setComposeTime(reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); + } else if ("version".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData + .setVersion(reader.getNullable(JsonReader::getLong)); + } else if ("messageBody".equals(fieldName)) { + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.messageBody = reader.getString(); + } else if ("metadata".equals(fieldName)) { + Map metadata = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsChatTypingIndicatorReceivedInThreadEventData.metadata = metadata; + } else { + reader.skipChildren(); + } + } + + return deserializedAcsChatTypingIndicatorReceivedInThreadEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java index 981511c4dc7e..e4edad492efa 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java @@ -212,9 +212,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("sender", this.sender); jsonWriter.writeStringField("recipient", this.recipient); jsonWriter.writeStringField("internetMessageId", this.internetMessageId); + jsonWriter.writeJsonField("deliveryStatusDetails", this.deliveryStatusDetails); jsonWriter.writeStringField("messageId", this.messageId); jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString()); - jsonWriter.writeJsonField("deliveryStatusDetails", this.deliveryStatusDetails); jsonWriter.writeStringField("deliveryAttemptTimestamp", this.deliveryAttemptTimestamp == null ? null @@ -228,6 +228,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsEmailDeliveryReportReceivedEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsEmailDeliveryReportReceivedEventData. */ public static AcsEmailDeliveryReportReceivedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -244,14 +245,14 @@ public static AcsEmailDeliveryReportReceivedEventData fromJson(JsonReader jsonRe deserializedAcsEmailDeliveryReportReceivedEventData.recipient = reader.getString(); } else if ("internetMessageId".equals(fieldName)) { deserializedAcsEmailDeliveryReportReceivedEventData.internetMessageId = reader.getString(); + } else if ("deliveryStatusDetails".equals(fieldName)) { + deserializedAcsEmailDeliveryReportReceivedEventData.deliveryStatusDetails + = AcsEmailDeliveryReportStatusDetails.fromJson(reader); } else if ("messageId".equals(fieldName)) { deserializedAcsEmailDeliveryReportReceivedEventData.messageId = reader.getString(); } else if ("status".equals(fieldName)) { deserializedAcsEmailDeliveryReportReceivedEventData.status = AcsEmailDeliveryReportStatus.fromString(reader.getString()); - } else if ("deliveryStatusDetails".equals(fieldName)) { - deserializedAcsEmailDeliveryReportReceivedEventData.deliveryStatusDetails - = AcsEmailDeliveryReportStatusDetails.fromJson(reader); } else if ("deliveryAttemptTimestamp".equals(fieldName)) { deserializedAcsEmailDeliveryReportReceivedEventData.deliveryAttemptTimestamp = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingFileStatusUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingFileStatusUpdatedEventData.java index da8c4e1d934f..56916dea952b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingFileStatusUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRecordingFileStatusUpdatedEventData.java @@ -238,6 +238,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRecordingFileStatusUpdatedEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRecordingFileStatusUpdatedEventData. */ public static AcsRecordingFileStatusUpdatedEventData fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java index 1290907758d4..82e62a706f2f 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCancelledEventData.java @@ -132,12 +132,12 @@ public AcsRouterJobCancelledEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("note", this.note); jsonWriter.writeStringField("dispositionCode", this.dispositionCode); return jsonWriter.writeEndObject(); @@ -149,6 +149,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobCancelledEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobCancelledEventData. */ public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) throws IOException { @@ -159,7 +160,13 @@ public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) thr String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobCancelledEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobCancelledEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobCancelledEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobCancelledEventData.setChannelReference(reader.getString()); @@ -167,12 +174,6 @@ public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) thr deserializedAcsRouterJobCancelledEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobCancelledEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobCancelledEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobCancelledEventData.setTags(tags); } else if ("note".equals(fieldName)) { deserializedAcsRouterJobCancelledEventData.note = reader.getString(); } else if ("dispositionCode".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java index e6f476ccd69c..b7a928187460 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassificationFailedEventData.java @@ -140,12 +140,12 @@ public AcsRouterJobClassificationFailedEventData setChannelId(String channelId) @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("classificationPolicyId", this.classificationPolicyId); jsonWriter.writeArrayField("errors", this.errors, (writer, element) -> writer.writeJson(element)); return jsonWriter.writeEndObject(); @@ -157,6 +157,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobClassificationFailedEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobClassificationFailedEventData. */ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -166,7 +167,13 @@ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader json while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobClassificationFailedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobClassificationFailedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobClassificationFailedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobClassificationFailedEventData.setChannelReference(reader.getString()); @@ -174,12 +181,6 @@ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader json deserializedAcsRouterJobClassificationFailedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobClassificationFailedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobClassificationFailedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobClassificationFailedEventData.setTags(tags); } else if ("classificationPolicyId".equals(fieldName)) { deserializedAcsRouterJobClassificationFailedEventData.classificationPolicyId = reader.getString(); } else if ("errors".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java index ba590e6fb120..2c7e17f62605 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClassifiedEventData.java @@ -184,12 +184,12 @@ public AcsRouterJobClassifiedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("queueDetails", this.queueDetails); jsonWriter.writeStringField("classificationPolicyId", this.classificationPolicyId); jsonWriter.writeNumberField("priority", this.priority); @@ -204,6 +204,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobClassifiedEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobClassifiedEventData. */ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -214,7 +215,13 @@ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) th String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobClassifiedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobClassifiedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobClassifiedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobClassifiedEventData.setChannelReference(reader.getString()); @@ -222,12 +229,6 @@ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) th deserializedAcsRouterJobClassifiedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobClassifiedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobClassifiedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobClassifiedEventData.setTags(tags); } else if ("queueDetails".equals(fieldName)) { deserializedAcsRouterJobClassifiedEventData.queueDetails = AcsRouterQueueDetails.fromJson(reader); } else if ("classificationPolicyId".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java index 930396538824..95d9f68d8bfb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobClosedEventData.java @@ -157,12 +157,12 @@ public AcsRouterJobClosedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("assignmentId", this.assignmentId); jsonWriter.writeStringField("workerId", this.workerId); jsonWriter.writeStringField("dispositionCode", this.dispositionCode); @@ -175,6 +175,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobClosedEventData if the JsonReader was pointing to an instance of it, or null * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobClosedEventData. */ public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -184,7 +185,13 @@ public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobClosedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobClosedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobClosedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobClosedEventData.setChannelReference(reader.getString()); @@ -192,12 +199,6 @@ public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws deserializedAcsRouterJobClosedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobClosedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobClosedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobClosedEventData.setTags(tags); } else if ("assignmentId".equals(fieldName)) { deserializedAcsRouterJobClosedEventData.assignmentId = reader.getString(); } else if ("workerId".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java index e644bb113fc5..808d9a1f64d0 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobCompletedEventData.java @@ -132,12 +132,12 @@ public AcsRouterJobCompletedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("assignmentId", this.assignmentId); jsonWriter.writeStringField("workerId", this.workerId); return jsonWriter.writeEndObject(); @@ -149,6 +149,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobCompletedEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobCompletedEventData. */ public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -159,7 +160,13 @@ public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) thr String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobCompletedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobCompletedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobCompletedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobCompletedEventData.setChannelReference(reader.getString()); @@ -167,12 +174,6 @@ public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) thr deserializedAcsRouterJobCompletedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobCompletedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobCompletedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobCompletedEventData.setTags(tags); } else if ("assignmentId".equals(fieldName)) { deserializedAcsRouterJobCompletedEventData.assignmentId = reader.getString(); } else if ("workerId".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java index 2ef4bd8b9b40..87814d57e315 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobDeletedEventData.java @@ -82,12 +82,12 @@ public AcsRouterJobDeletedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -97,6 +97,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobDeletedEventData if the JsonReader was pointing to an instance of it, or null * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobDeletedEventData. */ public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -106,7 +107,13 @@ public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throw String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobDeletedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobDeletedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobDeletedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobDeletedEventData.setChannelReference(reader.getString()); @@ -114,12 +121,6 @@ public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throw deserializedAcsRouterJobDeletedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobDeletedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobDeletedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobDeletedEventData.setTags(tags); } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java index e343bac911c7..42aa79198a69 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobEventData.java @@ -133,9 +133,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); - jsonWriter.writeStringField("queueId", this.queueId); jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); + jsonWriter.writeStringField("queueId", this.queueId); return jsonWriter.writeEndObject(); } @@ -145,6 +145,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobEventData if the JsonReader was pointing to an instance of it, or null if it * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobEventData. */ public static AcsRouterJobEventData fromJson(JsonReader jsonReader) throws IOException { @@ -160,14 +161,14 @@ public static AcsRouterJobEventData fromJson(JsonReader jsonReader) throws IOExc deserializedAcsRouterJobEventData.setChannelReference(reader.getString()); } else if ("channelId".equals(fieldName)) { deserializedAcsRouterJobEventData.setChannelId(reader.getString()); - } else if ("queueId".equals(fieldName)) { - deserializedAcsRouterJobEventData.queueId = reader.getString(); } else if ("labels".equals(fieldName)) { Map labels = reader.readMap(reader1 -> reader1.getString()); deserializedAcsRouterJobEventData.labels = labels; } else if ("tags".equals(fieldName)) { Map tags = reader.readMap(reader1 -> reader1.getString()); deserializedAcsRouterJobEventData.tags = tags; + } else if ("queueId".equals(fieldName)) { + deserializedAcsRouterJobEventData.queueId = reader.getString(); } else { reader.skipChildren(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java index 5380fa8c471e..46c05cdf45f6 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobExceptionTriggeredEventData.java @@ -132,12 +132,12 @@ public AcsRouterJobExceptionTriggeredEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("ruleKey", this.ruleKey); jsonWriter.writeStringField("exceptionRuleId", this.exceptionRuleId); return jsonWriter.writeEndObject(); @@ -149,6 +149,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobExceptionTriggeredEventData if the JsonReader was pointing to an instance of * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobExceptionTriggeredEventData. */ public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonReader) throws IOException { @@ -159,7 +160,13 @@ public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonRe String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobExceptionTriggeredEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobExceptionTriggeredEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobExceptionTriggeredEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobExceptionTriggeredEventData.setChannelReference(reader.getString()); @@ -167,12 +174,6 @@ public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonRe deserializedAcsRouterJobExceptionTriggeredEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobExceptionTriggeredEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobExceptionTriggeredEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobExceptionTriggeredEventData.setTags(tags); } else if ("ruleKey".equals(fieldName)) { deserializedAcsRouterJobExceptionTriggeredEventData.ruleKey = reader.getString(); } else if ("exceptionRuleId".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java index f59ec9033d9b..9ba20b98b6f2 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobQueuedEventData.java @@ -160,12 +160,12 @@ public AcsRouterJobQueuedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeNumberField("priority", this.priority); jsonWriter.writeArrayField("attachedWorkerSelectors", this.attachedWorkerSelectors, (writer, element) -> writer.writeJson(element)); @@ -180,6 +180,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobQueuedEventData if the JsonReader was pointing to an instance of it, or null * if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobQueuedEventData. */ public static AcsRouterJobQueuedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -189,7 +190,13 @@ public static AcsRouterJobQueuedEventData fromJson(JsonReader jsonReader) throws String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobQueuedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobQueuedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobQueuedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobQueuedEventData.setChannelReference(reader.getString()); @@ -197,12 +204,6 @@ public static AcsRouterJobQueuedEventData fromJson(JsonReader jsonReader) throws deserializedAcsRouterJobQueuedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobQueuedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobQueuedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobQueuedEventData.setTags(tags); } else if ("priority".equals(fieldName)) { deserializedAcsRouterJobQueuedEventData.priority = reader.getNullable(JsonReader::getInt); } else if ("attachedWorkerSelectors".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java index ee528436c1fa..cdb06272ef40 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobReceivedEventData.java @@ -237,12 +237,12 @@ public AcsRouterJobReceivedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("unavailableForMatching", this.unavailableForMatching); jsonWriter.writeStringField("jobStatus", this.jobStatus == null ? null : this.jobStatus.toString()); jsonWriter.writeStringField("classificationPolicyId", this.classificationPolicyId); @@ -270,7 +270,13 @@ public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) thro while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobReceivedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobReceivedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobReceivedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobReceivedEventData.setChannelReference(reader.getString()); @@ -278,12 +284,6 @@ public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) thro deserializedAcsRouterJobReceivedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobReceivedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobReceivedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobReceivedEventData.setTags(tags); } else if ("unavailableForMatching".equals(fieldName)) { deserializedAcsRouterJobReceivedEventData.unavailableForMatching = reader.getBoolean(); } else if ("jobStatus".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java index e1728b86fb86..738abb028099 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobSchedulingFailedEventData.java @@ -213,12 +213,12 @@ public AcsRouterJobSchedulingFailedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeNumberField("priority", this.priority); jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, (writer, element) -> writer.writeJson(element)); @@ -236,6 +236,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobSchedulingFailedEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobSchedulingFailedEventData. */ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -246,7 +247,13 @@ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonRead String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobSchedulingFailedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobSchedulingFailedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobSchedulingFailedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobSchedulingFailedEventData.setChannelReference(reader.getString()); @@ -254,12 +261,6 @@ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonRead deserializedAcsRouterJobSchedulingFailedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobSchedulingFailedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobSchedulingFailedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobSchedulingFailedEventData.setTags(tags); } else if ("priority".equals(fieldName)) { deserializedAcsRouterJobSchedulingFailedEventData.priority = reader.getNullable(JsonReader::getInt); } else if ("expiredAttachedWorkerSelectors".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java index 6725af620a17..5997992a117e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobUnassignedEventData.java @@ -132,12 +132,12 @@ public AcsRouterJobUnassignedEventData setChannelId(String channelId) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("assignmentId", this.assignmentId); jsonWriter.writeStringField("workerId", this.workerId); return jsonWriter.writeEndObject(); @@ -149,6 +149,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobUnassignedEventData if the JsonReader was pointing to an instance of it, or * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobUnassignedEventData. */ public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) throws IOException { @@ -159,7 +160,13 @@ public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) th String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobUnassignedEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobUnassignedEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobUnassignedEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobUnassignedEventData.setChannelReference(reader.getString()); @@ -167,12 +174,6 @@ public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) th deserializedAcsRouterJobUnassignedEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobUnassignedEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobUnassignedEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobUnassignedEventData.setTags(tags); } else if ("assignmentId".equals(fieldName)) { deserializedAcsRouterJobUnassignedEventData.assignmentId = reader.getString(); } else if ("workerId".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java index 32b856320a25..0e2c87bf072e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWaitingForActivationEventData.java @@ -215,12 +215,12 @@ public AcsRouterJobWaitingForActivationEventData setChannelId(String channelId) @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("unavailableForMatching", this.unavailableForMatching); jsonWriter.writeNumberField("priority", this.priority); jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, @@ -248,7 +248,13 @@ public static AcsRouterJobWaitingForActivationEventData fromJson(JsonReader json while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobWaitingForActivationEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobWaitingForActivationEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobWaitingForActivationEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobWaitingForActivationEventData.setChannelReference(reader.getString()); @@ -256,12 +262,6 @@ public static AcsRouterJobWaitingForActivationEventData fromJson(JsonReader json deserializedAcsRouterJobWaitingForActivationEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobWaitingForActivationEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobWaitingForActivationEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobWaitingForActivationEventData.setTags(tags); } else if ("unavailableForMatching".equals(fieldName)) { deserializedAcsRouterJobWaitingForActivationEventData.unavailableForMatching = reader.getBoolean(); } else if ("priority".equals(fieldName)) { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java index 6b124fa3dd0c..932b25101947 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsRouterJobWorkerSelectorsExpiredEventData.java @@ -135,12 +135,12 @@ public AcsRouterJobWorkerSelectorsExpiredEventData setChannelId(String channelId @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); + jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); - jsonWriter.writeMapField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("expiredRequestedWorkerSelectors", this.expiredRequestedWorkerSelectors, (writer, element) -> writer.writeJson(element)); jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, @@ -154,6 +154,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsRouterJobWorkerSelectorsExpiredEventData if the JsonReader was pointing to an instance * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsRouterJobWorkerSelectorsExpiredEventData. */ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader jsonReader) throws IOException { @@ -164,7 +165,13 @@ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader js String fieldName = reader.getFieldName(); reader.nextToken(); - if ("jobId".equals(fieldName)) { + if ("labels".equals(fieldName)) { + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setLabels(labels); + } else if ("tags".equals(fieldName)) { + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setTags(tags); + } else if ("jobId".equals(fieldName)) { deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setJobId(reader.getString()); } else if ("channelReference".equals(fieldName)) { deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setChannelReference(reader.getString()); @@ -172,12 +179,6 @@ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader js deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setChannelId(reader.getString()); } else if ("queueId".equals(fieldName)) { deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setQueueId(reader.getString()); - } else if ("labels".equals(fieldName)) { - Map labels = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setLabels(labels); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedAcsRouterJobWorkerSelectorsExpiredEventData.setTags(tags); } else if ("expiredRequestedWorkerSelectors".equals(fieldName)) { List expiredRequestedWorkerSelectors = reader.readArray(reader1 -> AcsRouterWorkerSelector.fromJson(reader1)); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java index 0cc6ccf732bc..f812014248ae 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java @@ -205,6 +205,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsSmsDeliveryReportReceivedEventData if the JsonReader was pointing to an instance of it, * or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsSmsDeliveryReportReceivedEventData. */ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java index ebe4d188cece..ea3ed1072f92 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java @@ -115,6 +115,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AcsSmsEventBaseProperties if the JsonReader was pointing to an instance of it, or null if * it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. * @throws IOException If an error occurs while reading the AcsSmsEventBaseProperties. */ public static AcsSmsEventBaseProperties fromJson(JsonReader jsonReader) throws IOException { diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java index adb947525c6b..ee33e75548d8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java @@ -135,8 +135,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("from", getFrom()); jsonWriter.writeStringField("to", getTo()); - jsonWriter.writeIntField("segmentCount", this.segmentCount); jsonWriter.writeStringField("message", this.message); + jsonWriter.writeIntField("segmentCount", this.segmentCount); jsonWriter.writeStringField("receivedTimestamp", this.receivedTimestamp == null ? null @@ -165,10 +165,10 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE deserializedAcsSmsReceivedEventData.setFrom(reader.getString()); } else if ("to".equals(fieldName)) { deserializedAcsSmsReceivedEventData.setTo(reader.getString()); - } else if ("segmentCount".equals(fieldName)) { - deserializedAcsSmsReceivedEventData.segmentCount = reader.getInt(); } else if ("message".equals(fieldName)) { deserializedAcsSmsReceivedEventData.message = reader.getString(); + } else if ("segmentCount".equals(fieldName)) { + deserializedAcsSmsReceivedEventData.segmentCount = reader.getInt(); } else if ("receivedTimestamp".equals(fieldName)) { deserializedAcsSmsReceivedEventData.receivedTimestamp = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerClosedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerClosedEventData.java new file mode 100644 index 000000000000..9f0102689c69 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerClosedEventData.java @@ -0,0 +1,117 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Closed event. + */ +@Fluent +public final class ApiManagementCircuitBreakerClosedEventData + implements JsonSerializable { + /* + * Name of the backend for which the circuit has closed. + */ + private String backendName; + + /* + * Information related to the circuit breaker configured on the backend. + */ + private ApiManagementCircuitBreakerProperties circuitBreaker; + + /** + * Creates an instance of ApiManagementCircuitBreakerClosedEventData class. + */ + public ApiManagementCircuitBreakerClosedEventData() { + } + + /** + * Get the backendName property: Name of the backend for which the circuit has closed. + * + * @return the backendName value. + */ + public String getBackendName() { + return this.backendName; + } + + /** + * Set the backendName property: Name of the backend for which the circuit has closed. + * + * @param backendName the backendName value to set. + * @return the ApiManagementCircuitBreakerClosedEventData object itself. + */ + public ApiManagementCircuitBreakerClosedEventData setBackendName(String backendName) { + this.backendName = backendName; + return this; + } + + /** + * Get the circuitBreaker property: Information related to the circuit breaker configured on the backend. + * + * @return the circuitBreaker value. + */ + public ApiManagementCircuitBreakerProperties getCircuitBreaker() { + return this.circuitBreaker; + } + + /** + * Set the circuitBreaker property: Information related to the circuit breaker configured on the backend. + * + * @param circuitBreaker the circuitBreaker value to set. + * @return the ApiManagementCircuitBreakerClosedEventData object itself. + */ + public ApiManagementCircuitBreakerClosedEventData + setCircuitBreaker(ApiManagementCircuitBreakerProperties circuitBreaker) { + this.circuitBreaker = circuitBreaker; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("backendName", this.backendName); + jsonWriter.writeJsonField("circuitBreaker", this.circuitBreaker); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerClosedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerClosedEventData if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerClosedEventData. + */ + public static ApiManagementCircuitBreakerClosedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementCircuitBreakerClosedEventData deserializedApiManagementCircuitBreakerClosedEventData + = new ApiManagementCircuitBreakerClosedEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("backendName".equals(fieldName)) { + deserializedApiManagementCircuitBreakerClosedEventData.backendName = reader.getString(); + } else if ("circuitBreaker".equals(fieldName)) { + deserializedApiManagementCircuitBreakerClosedEventData.circuitBreaker + = ApiManagementCircuitBreakerProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementCircuitBreakerClosedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerOpenedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerOpenedEventData.java new file mode 100644 index 000000000000..7c7bc4ed8f38 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerOpenedEventData.java @@ -0,0 +1,117 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.CircuitBreaker.Opened event. + */ +@Fluent +public final class ApiManagementCircuitBreakerOpenedEventData + implements JsonSerializable { + /* + * Name of the backend for which the circuit has opened. + */ + private String backendName; + + /* + * Information related to the circuit breaker configured on the backend. + */ + private ApiManagementCircuitBreakerProperties circuitBreaker; + + /** + * Creates an instance of ApiManagementCircuitBreakerOpenedEventData class. + */ + public ApiManagementCircuitBreakerOpenedEventData() { + } + + /** + * Get the backendName property: Name of the backend for which the circuit has opened. + * + * @return the backendName value. + */ + public String getBackendName() { + return this.backendName; + } + + /** + * Set the backendName property: Name of the backend for which the circuit has opened. + * + * @param backendName the backendName value to set. + * @return the ApiManagementCircuitBreakerOpenedEventData object itself. + */ + public ApiManagementCircuitBreakerOpenedEventData setBackendName(String backendName) { + this.backendName = backendName; + return this; + } + + /** + * Get the circuitBreaker property: Information related to the circuit breaker configured on the backend. + * + * @return the circuitBreaker value. + */ + public ApiManagementCircuitBreakerProperties getCircuitBreaker() { + return this.circuitBreaker; + } + + /** + * Set the circuitBreaker property: Information related to the circuit breaker configured on the backend. + * + * @param circuitBreaker the circuitBreaker value to set. + * @return the ApiManagementCircuitBreakerOpenedEventData object itself. + */ + public ApiManagementCircuitBreakerOpenedEventData + setCircuitBreaker(ApiManagementCircuitBreakerProperties circuitBreaker) { + this.circuitBreaker = circuitBreaker; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("backendName", this.backendName); + jsonWriter.writeJsonField("circuitBreaker", this.circuitBreaker); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerOpenedEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerOpenedEventData if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerOpenedEventData. + */ + public static ApiManagementCircuitBreakerOpenedEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementCircuitBreakerOpenedEventData deserializedApiManagementCircuitBreakerOpenedEventData + = new ApiManagementCircuitBreakerOpenedEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("backendName".equals(fieldName)) { + deserializedApiManagementCircuitBreakerOpenedEventData.backendName = reader.getString(); + } else if ("circuitBreaker".equals(fieldName)) { + deserializedApiManagementCircuitBreakerOpenedEventData.circuitBreaker + = ApiManagementCircuitBreakerProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementCircuitBreakerOpenedEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerProperties.java new file mode 100644 index 000000000000..eb1a03202060 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementCircuitBreakerProperties.java @@ -0,0 +1,89 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Map; + +/** + * Information related to the circuit breaker configured on the backend. + */ +@Fluent +public final class ApiManagementCircuitBreakerProperties + implements JsonSerializable { + /* + * Overview of all configured rules and respective details. + */ + private Map rules; + + /** + * Creates an instance of ApiManagementCircuitBreakerProperties class. + */ + public ApiManagementCircuitBreakerProperties() { + } + + /** + * Get the rules property: Overview of all configured rules and respective details. + * + * @return the rules value. + */ + public Map getRules() { + return this.rules; + } + + /** + * Set the rules property: Overview of all configured rules and respective details. + * + * @param rules the rules value to set. + * @return the ApiManagementCircuitBreakerProperties object itself. + */ + public ApiManagementCircuitBreakerProperties setRules(Map rules) { + this.rules = rules; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeMapField("rules", this.rules, (writer, element) -> writer.writeUntyped(element)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementCircuitBreakerProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementCircuitBreakerProperties if the JsonReader was pointing to an instance of it, + * or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementCircuitBreakerProperties. + */ + public static ApiManagementCircuitBreakerProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementCircuitBreakerProperties deserializedApiManagementCircuitBreakerProperties + = new ApiManagementCircuitBreakerProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("rules".equals(fieldName)) { + Map rules = reader.readMap(reader1 -> reader1.readUntyped()); + deserializedApiManagementCircuitBreakerProperties.rules = rules; + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementCircuitBreakerProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementExpiredGatewayTokenProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementExpiredGatewayTokenProperties.java new file mode 100644 index 000000000000..e3d42b23855a --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementExpiredGatewayTokenProperties.java @@ -0,0 +1,92 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Information related to a an expired gateway token for a self-hosted gateway deployment. + */ +@Fluent +public final class ApiManagementExpiredGatewayTokenProperties + implements JsonSerializable { + /* + * Timestamp when the gateway token has expired. + */ + private OffsetDateTime expiresOn; + + /** + * Creates an instance of ApiManagementExpiredGatewayTokenProperties class. + */ + public ApiManagementExpiredGatewayTokenProperties() { + } + + /** + * Get the expiresOn property: Timestamp when the gateway token has expired. + * + * @return the expiresOn value. + */ + public OffsetDateTime getExpiresOn() { + return this.expiresOn; + } + + /** + * Set the expiresOn property: Timestamp when the gateway token has expired. + * + * @param expiresOn the expiresOn value to set. + * @return the ApiManagementExpiredGatewayTokenProperties object itself. + */ + public ApiManagementExpiredGatewayTokenProperties setExpiresOn(OffsetDateTime expiresOn) { + this.expiresOn = expiresOn; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("expiredAtUtc", + this.expiresOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.expiresOn)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementExpiredGatewayTokenProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementExpiredGatewayTokenProperties if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementExpiredGatewayTokenProperties. + */ + public static ApiManagementExpiredGatewayTokenProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementExpiredGatewayTokenProperties deserializedApiManagementExpiredGatewayTokenProperties + = new ApiManagementExpiredGatewayTokenProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("expiredAtUtc".equals(fieldName)) { + deserializedApiManagementExpiredGatewayTokenProperties.expiresOn = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementExpiredGatewayTokenProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayProperties.java new file mode 100644 index 000000000000..bee3595ca68c --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayProperties.java @@ -0,0 +1,117 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Information related to a given self-hosted gateway deployment. + */ +@Fluent +public final class ApiManagementGatewayProperties implements JsonSerializable { + /* + * Id of Gateway that is used to deploy the gateway to get the configuration for. This is the ARM resource ID + * referenced in the Azure API Management instance. + */ + private String gatewayId; + + /* + * Unique instance ID of the deployed gateway + */ + private String instanceId; + + /** + * Creates an instance of ApiManagementGatewayProperties class. + */ + public ApiManagementGatewayProperties() { + } + + /** + * Get the gatewayId property: Id of Gateway that is used to deploy the gateway to get the configuration for. This + * is the ARM resource ID referenced in the Azure API Management instance. + * + * @return the gatewayId value. + */ + public String getGatewayId() { + return this.gatewayId; + } + + /** + * Set the gatewayId property: Id of Gateway that is used to deploy the gateway to get the configuration for. This + * is the ARM resource ID referenced in the Azure API Management instance. + * + * @param gatewayId the gatewayId value to set. + * @return the ApiManagementGatewayProperties object itself. + */ + public ApiManagementGatewayProperties setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + return this; + } + + /** + * Get the instanceId property: Unique instance ID of the deployed gateway. + * + * @return the instanceId value. + */ + public String getInstanceId() { + return this.instanceId; + } + + /** + * Set the instanceId property: Unique instance ID of the deployed gateway. + * + * @param instanceId the instanceId value to set. + * @return the ApiManagementGatewayProperties object itself. + */ + public ApiManagementGatewayProperties setInstanceId(String instanceId) { + this.instanceId = instanceId; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("gatewayId", this.gatewayId); + jsonWriter.writeStringField("instanceId", this.instanceId); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayProperties if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementGatewayProperties. + */ + public static ApiManagementGatewayProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementGatewayProperties deserializedApiManagementGatewayProperties + = new ApiManagementGatewayProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("gatewayId".equals(fieldName)) { + deserializedApiManagementGatewayProperties.gatewayId = reader.getString(); + } else if ("instanceId".equals(fieldName)) { + deserializedApiManagementGatewayProperties.instanceId = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementGatewayProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenExpiredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenExpiredEventData.java new file mode 100644 index 000000000000..92ec05be0da9 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenExpiredEventData.java @@ -0,0 +1,117 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenExpired event. + */ +@Fluent +public final class ApiManagementGatewayTokenExpiredEventData + implements JsonSerializable { + /* + * Information related to a given self-hosted gateway deployment. + */ + private ApiManagementGatewayProperties gateway; + + /* + * Information related to a an expired gateway token for a self-hosted gateway deployment. + */ + private ApiManagementExpiredGatewayTokenProperties token; + + /** + * Creates an instance of ApiManagementGatewayTokenExpiredEventData class. + */ + public ApiManagementGatewayTokenExpiredEventData() { + } + + /** + * Get the gateway property: Information related to a given self-hosted gateway deployment. + * + * @return the gateway value. + */ + public ApiManagementGatewayProperties getGateway() { + return this.gateway; + } + + /** + * Set the gateway property: Information related to a given self-hosted gateway deployment. + * + * @param gateway the gateway value to set. + * @return the ApiManagementGatewayTokenExpiredEventData object itself. + */ + public ApiManagementGatewayTokenExpiredEventData setGateway(ApiManagementGatewayProperties gateway) { + this.gateway = gateway; + return this; + } + + /** + * Get the token property: Information related to a an expired gateway token for a self-hosted gateway deployment. + * + * @return the token value. + */ + public ApiManagementExpiredGatewayTokenProperties getToken() { + return this.token; + } + + /** + * Set the token property: Information related to a an expired gateway token for a self-hosted gateway deployment. + * + * @param token the token value to set. + * @return the ApiManagementGatewayTokenExpiredEventData object itself. + */ + public ApiManagementGatewayTokenExpiredEventData setToken(ApiManagementExpiredGatewayTokenProperties token) { + this.token = token; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("gatewayInfo", this.gateway); + jsonWriter.writeJsonField("tokenInfo", this.token); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayTokenExpiredEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayTokenExpiredEventData if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementGatewayTokenExpiredEventData. + */ + public static ApiManagementGatewayTokenExpiredEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementGatewayTokenExpiredEventData deserializedApiManagementGatewayTokenExpiredEventData + = new ApiManagementGatewayTokenExpiredEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("gatewayInfo".equals(fieldName)) { + deserializedApiManagementGatewayTokenExpiredEventData.gateway + = ApiManagementGatewayProperties.fromJson(reader); + } else if ("tokenInfo".equals(fieldName)) { + deserializedApiManagementGatewayTokenExpiredEventData.token + = ApiManagementExpiredGatewayTokenProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementGatewayTokenExpiredEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryEventData.java new file mode 100644 index 000000000000..e9233efa3820 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryEventData.java @@ -0,0 +1,119 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayTokenNearExpiry event. + */ +@Fluent +public final class ApiManagementGatewayTokenNearExpiryEventData + implements JsonSerializable { + /* + * Information related to a given self-hosted gateway deployment. + */ + private ApiManagementGatewayProperties gateway; + + /* + * Information related to a gateway token that is near expiry for a self-hosted gateway deployment. + */ + private ApiManagementGatewayTokenNearExpiryProperties token; + + /** + * Creates an instance of ApiManagementGatewayTokenNearExpiryEventData class. + */ + public ApiManagementGatewayTokenNearExpiryEventData() { + } + + /** + * Get the gateway property: Information related to a given self-hosted gateway deployment. + * + * @return the gateway value. + */ + public ApiManagementGatewayProperties getGateway() { + return this.gateway; + } + + /** + * Set the gateway property: Information related to a given self-hosted gateway deployment. + * + * @param gateway the gateway value to set. + * @return the ApiManagementGatewayTokenNearExpiryEventData object itself. + */ + public ApiManagementGatewayTokenNearExpiryEventData setGateway(ApiManagementGatewayProperties gateway) { + this.gateway = gateway; + return this; + } + + /** + * Get the token property: Information related to a gateway token that is near expiry for a self-hosted gateway + * deployment. + * + * @return the token value. + */ + public ApiManagementGatewayTokenNearExpiryProperties getToken() { + return this.token; + } + + /** + * Set the token property: Information related to a gateway token that is near expiry for a self-hosted gateway + * deployment. + * + * @param token the token value to set. + * @return the ApiManagementGatewayTokenNearExpiryEventData object itself. + */ + public ApiManagementGatewayTokenNearExpiryEventData setToken(ApiManagementGatewayTokenNearExpiryProperties token) { + this.token = token; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeJsonField("gatewayInfo", this.gateway); + jsonWriter.writeJsonField("tokenInfo", this.token); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayTokenNearExpiryEventData from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayTokenNearExpiryEventData if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementGatewayTokenNearExpiryEventData. + */ + public static ApiManagementGatewayTokenNearExpiryEventData fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementGatewayTokenNearExpiryEventData deserializedApiManagementGatewayTokenNearExpiryEventData + = new ApiManagementGatewayTokenNearExpiryEventData(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("gatewayInfo".equals(fieldName)) { + deserializedApiManagementGatewayTokenNearExpiryEventData.gateway + = ApiManagementGatewayProperties.fromJson(reader); + } else if ("tokenInfo".equals(fieldName)) { + deserializedApiManagementGatewayTokenNearExpiryEventData.token + = ApiManagementGatewayTokenNearExpiryProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementGatewayTokenNearExpiryEventData; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryProperties.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryProperties.java new file mode 100644 index 000000000000..edda53873a72 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementGatewayTokenNearExpiryProperties.java @@ -0,0 +1,92 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.messaging.eventgrid.systemevents; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Information related to a gateway token that is near expiry for a self-hosted gateway deployment. + */ +@Fluent +public final class ApiManagementGatewayTokenNearExpiryProperties + implements JsonSerializable { + /* + * Timestamp when the gateway token will expire. + */ + private OffsetDateTime expiresOn; + + /** + * Creates an instance of ApiManagementGatewayTokenNearExpiryProperties class. + */ + public ApiManagementGatewayTokenNearExpiryProperties() { + } + + /** + * Get the expiresOn property: Timestamp when the gateway token will expire. + * + * @return the expiresOn value. + */ + public OffsetDateTime getExpiresOn() { + return this.expiresOn; + } + + /** + * Set the expiresOn property: Timestamp when the gateway token will expire. + * + * @param expiresOn the expiresOn value to set. + * @return the ApiManagementGatewayTokenNearExpiryProperties object itself. + */ + public ApiManagementGatewayTokenNearExpiryProperties setExpiresOn(OffsetDateTime expiresOn) { + this.expiresOn = expiresOn; + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("expiresAtUtc", + this.expiresOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.expiresOn)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ApiManagementGatewayTokenNearExpiryProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ApiManagementGatewayTokenNearExpiryProperties if the JsonReader was pointing to an + * instance of it, or null if it was pointing to JSON null. + * @throws IOException If an error occurs while reading the ApiManagementGatewayTokenNearExpiryProperties. + */ + public static ApiManagementGatewayTokenNearExpiryProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ApiManagementGatewayTokenNearExpiryProperties deserializedApiManagementGatewayTokenNearExpiryProperties + = new ApiManagementGatewayTokenNearExpiryProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("expiresAtUtc".equals(fieldName)) { + deserializedApiManagementGatewayTokenNearExpiryProperties.expiresOn = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + + return deserializedApiManagementGatewayTokenNearExpiryProperties; + }); + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md index 3d3ebc190032..aa021cd294ec 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md @@ -86,34 +86,34 @@ custom-types: CloudEvent,EventGridEvent,AcsRouterCommunicationError,AcsMessageCh input-file: -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8af03db33a90581edffb8a32fea562f36b7c61a8/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/ContainerServiceEventResources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bd35e5887c166f9ec7a4755d3f8315f0083ad77/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/ContainerServiceEventResources.json ``` diff --git a/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java b/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java index ae97caec55ae..463dbe89b42a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java @@ -251,6 +251,7 @@ public void customize(LibraryCustomization customization, Logger logger) { customizeCommunicationIdentifierModelKind(customization); customizeAcsMessageChannelEventError(customization); customizeCommuicationSMSEvents(customization); + customizeAcsCallEndedEventDataDuration(customization); } public void customizeCommuicationSMSEvents(LibraryCustomization customization) { @@ -694,6 +695,40 @@ private static void customizeEventGridEvent(ClassCustomization classCustomizatio editor.replaceFile(classCustomization.getFileName(), replacedContent); } + public void customizeAcsCallEndedEventDataDuration(LibraryCustomization customization) { + PackageCustomization packageModels = customization.getPackage("com.azure.messaging.eventgrid.systemevents"); + ClassCustomization classCustomization = packageModels.getClass("AcsCallEndedEventData"); + classCustomization.customizeAst(compilationUnit -> { + PropertyCustomization property = classCustomization.getProperty("callDurationInSeconds"); + property.generateGetterAndSetter(); + + ClassOrInterfaceDeclaration clazz = compilationUnit.getClassByName("AcsCallEndedEventData").get(); + compilationUnit.addImport("java.time.Duration"); + clazz.getMethodsByName("getCallDurationInSeconds").forEach(m -> { + m.setName("getCallDuration") + .setType("Duration") + .setBody(parseBlock("{ if (this.callDurationInSeconds != null) { return Duration.ofNanos((long) (this.callDurationInSeconds * 1000_000_000L)); } return null; }")) + .setJavadocComment(new Javadoc(new JavadocDescription(List.of(new JavadocSnippet("Get the callDuration property:Duration of the call in seconds.")))) + .addBlockTag("return", "the callDuration value.")); + }); + + clazz.getMethodsByName("setCallDurationInSeconds").forEach(m -> { + m.setName("setCallDuration") + .setType("AcsCallEndedEventData") + .setParameters(new NodeList<>( new Parameter().setType("Duration").setName("callDuration"))) + .setBody(parseBlock("{ if (callDuration != null) {\n" + + " this.callDurationInSeconds = callDuration.toNanos() / 1_000_000_000f;\n" + + " } else {\n" + + " this.callDurationInSeconds = null;\n" + + " }\n" + + " return this; }")) + .setJavadocComment(new Javadoc(new JavadocDescription(List.of(new JavadocSnippet("Set the callDuration property: Duration of the call in seconds.")))) + .addBlockTag("param", "callDuration the callDuration value to set.") + .addBlockTag("return", "the AcsCallEndedEventData object itself.")); + }); + }); + } + private static final Map replacementNames = new HashMap() { { put("SUBSCRIPTION_DELETED","EVENT_GRID_SUBSCRIPTION_DELETED");