From e8f02fd0fa90f35a9b049d108da41e0e34a653b6 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 21 Apr 2025 21:03:45 +0000 Subject: [PATCH] CodeGen from PR 33669 in Azure/azure-rest-api-specs Merge a2676eccfc3db4abecc73519206d6ef3ff5826c9 into c029f66d2273cdbe1204fdd46040786c5e40aa81 --- .../messaging/eventgrid/SystemEventNames.java | 46 +++ .../AcsCallEndReasonProperties.java | 118 +++++++ .../systemevents/AcsCallEndedByKind.java | 57 ++++ .../AcsCallEndedByProperties.java | 128 ++++++++ .../systemevents/AcsCallEndedEventData.java | 230 ++++++++++++++ .../systemevents/AcsCallGroupProperties.java | 80 +++++ .../AcsCallParticipantAddedEventData.java | 256 +++++++++++++++ .../AcsCallParticipantEventProperties.java | 300 ++++++++++++++++++ .../AcsCallParticipantProperties.java | 100 ++++++ .../AcsCallParticipantRemovedEventData.java | 256 +++++++++++++++ .../systemevents/AcsCallRoomProperties.java | 80 +++++ .../systemevents/AcsCallStartedEventData.java | 167 ++++++++++ .../AcsCallingEventProperties.java | 263 +++++++++++++++ ...reBotCommandReceivedInThreadEventData.java | 191 +++++++++++ .../AcsChatEventBaseProperties.java | 30 +- .../AcsChatEventInThreadBaseProperties.java | 37 +-- .../AcsChatMessageDeletedEventData.java | 119 ++----- ...csChatMessageDeletedInThreadEventData.java | 120 ++----- .../AcsChatMessageEditedEventData.java | 146 +++------ ...AcsChatMessageEditedInThreadEventData.java | 147 +++------ .../AcsChatMessageEventBaseProperties.java | 111 ++----- ...hatMessageEventInThreadBaseProperties.java | 113 ++----- .../AcsChatMessageReceivedEventData.java | 137 ++------ ...sChatMessageReceivedInThreadEventData.java | 138 +++----- ...ChatParticipantAddedToThreadEventData.java | 35 +- ...icipantAddedToThreadWithUserEventData.java | 37 +-- ...ParticipantRemovedFromThreadEventData.java | 34 +- ...antRemovedFromThreadWithUserEventData.java | 37 +-- .../AcsChatThreadCreatedEventData.java | 50 +-- ...AcsChatThreadCreatedWithUserEventData.java | 51 +-- .../AcsChatThreadDeletedEventData.java | 35 +- .../AcsChatThreadEventBaseProperties.java | 33 +- ...ChatThreadEventInThreadBaseProperties.java | 34 +- .../AcsChatThreadParticipantProperties.java | 18 +- ...sChatThreadPropertiesUpdatedEventData.java | 37 +-- ...readPropertiesUpdatedPerUserEventData.java | 50 +-- ...AcsChatThreadWithUserDeletedEventData.java | 33 +- ...ingIndicatorReceivedInThreadEventData.java | 191 +++++++++++ .../systemevents/AcsRouterEventData.java | 33 +- .../AcsRouterJobCancelledEventData.java | 35 +- ...outerJobClassificationFailedEventData.java | 37 +-- .../AcsRouterJobClassifiedEventData.java | 35 +- .../AcsRouterJobClosedEventData.java | 35 +- .../AcsRouterJobCompletedEventData.java | 35 +- .../AcsRouterJobDeletedEventData.java | 35 +- .../systemevents/AcsRouterJobEventData.java | 24 +- ...sRouterJobExceptionTriggeredEventData.java | 36 +-- .../AcsRouterJobQueuedEventData.java | 55 ++-- .../AcsRouterJobReceivedEventData.java | 35 +- ...AcsRouterJobSchedulingFailedEventData.java | 54 ++-- .../AcsRouterJobUnassignedEventData.java | 35 +- ...outerJobWaitingForActivationEventData.java | 55 ++-- ...terJobWorkerSelectorsExpiredEventData.java | 37 +-- .../AcsRouterWorkerDeletedEventData.java | 42 ++- .../AcsRouterWorkerEventData.java | 40 +-- ...AcsRouterWorkerOfferAcceptedEventData.java | 26 +- ...AcsRouterWorkerOfferDeclinedEventData.java | 50 ++- .../AcsRouterWorkerOfferExpiredEventData.java | 50 ++- .../AcsRouterWorkerOfferIssuedEventData.java | 30 +- .../AcsRouterWorkerOfferRevokedEventData.java | 50 ++- .../AcsSmsDeliveryAttemptProperties.java | 33 +- ...AcsSmsDeliveryReportReceivedEventData.java | 90 ++---- .../AcsSmsEventBaseProperties.java | 65 ++-- .../systemevents/AcsSmsReceivedEventData.java | 79 +---- .../CommunicationIdentifierModel.java | 49 ++- ...essaging-eventgrid_apiview_properties.json | 14 + .../tsp-location.yaml | 4 +- 67 files changed, 3295 insertions(+), 1948 deletions(-) create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndReasonProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByKind.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedByProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallGroupProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantAddedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantEventProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantRemovedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallRoomProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallStartedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallingEventProperties.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatAzureBotCommandReceivedInThreadEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatTypingIndicatorReceivedInThreadEventData.java 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..9bd8a4e991eb 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; @@ -212,6 +218,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 +337,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. */ @@ -1267,6 +1307,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 +1329,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); 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..8694b50c03b1 --- /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 endedby 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..f2ad7fb49ec9 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallEndedEventData.java @@ -0,0 +1,230 @@ +// 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.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 callDurationInSeconds; + + /* + * 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 callDurationInSeconds property: Duration of the call in seconds. + * + * @return the callDurationInSeconds value. + */ + @Generated + public Double getCallDurationInSeconds() { + return this.callDurationInSeconds; + } + + /** + * 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.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. + */ + @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 callDurationInSeconds = 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)) { + callDurationInSeconds = 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.callDurationInSeconds = callDurationInSeconds; + + 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..bb72b49b68ef --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsCallParticipantProperties.java @@ -0,0 +1,100 @@ +// 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 String 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 String 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); + 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 = 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/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..c78ff8dd3b1d 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,7 +38,7 @@ 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 @@ -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,20 +61,19 @@ 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, + private AcsChatThreadCreatedEventData(String threadId, OffsetDateTime createTime, CommunicationIdentifierModel createdByCommunicationIdentifier, Map properties, - Map metadata, List participants) { - super(createTime); + List participants) { + super(threadId, createTime); this.createdByCommunicationIdentifier = createdByCommunicationIdentifier; this.properties = properties; - this.metadata = metadata; this.participants = participants; } @@ -136,17 +129,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 +147,16 @@ 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)); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -190,25 +172,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 +198,19 @@ 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); + threadId, createTime, createdByCommunicationIdentifier, properties, participants); deserializedAcsChatThreadCreatedEventData.transactionId = transactionId; - deserializedAcsChatThreadCreatedEventData.threadId = threadId; deserializedAcsChatThreadCreatedEventData.version = version; + 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..2a454104db6d 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,7 +38,7 @@ 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 @@ -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,21 +62,19 @@ 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, List participants) { + super(recipientCommunicationIdentifier, threadId, createTime); this.createdByCommunicationIdentifier = createdByCommunicationIdentifier; this.properties = properties; - this.metadata = metadata; this.participants = participants; } @@ -138,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. * @@ -168,16 +149,16 @@ 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)); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -194,27 +175,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 +203,20 @@ 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, participants); deserializedAcsChatThreadCreatedWithUserEventData.transactionId = transactionId; - deserializedAcsChatThreadCreatedWithUserEventData.threadId = threadId; deserializedAcsChatThreadCreatedWithUserEventData.version = version; + 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/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..bfb5cbddbcbb 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 @@ -51,23 +51,18 @@ 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); + private AcsRouterJobClassificationFailedEventData(String jobId, Map labels, + Map tags, List errors) { + super(jobId, labels, tags); this.errors = errors; } @@ -126,17 +121,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,9 +128,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()); @@ -167,9 +151,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 +162,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,8 +183,7 @@ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader json } } AcsRouterJobClassificationFailedEventData deserializedAcsRouterJobClassificationFailedEventData - = new AcsRouterJobClassificationFailedEventData(labels, tags, errors); - deserializedAcsRouterJobClassificationFailedEventData.jobId = jobId; + = new AcsRouterJobClassificationFailedEventData(jobId, labels, tags, errors); deserializedAcsRouterJobClassificationFailedEventData.channelReference = channelReference; deserializedAcsRouterJobClassificationFailedEventData.channelId = channelId; deserializedAcsRouterJobClassificationFailedEventData.queueId = queueId; 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..9b23157f5132 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 @@ -60,24 +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, + private AcsRouterJobClassifiedEventData(String jobId, Map labels, Map tags, AcsRouterQueueDetails queueDetails, List attachedWorkerSelectors) { - super(labels, tags); + super(jobId, labels, tags); this.queueDetails = queueDetails; this.attachedWorkerSelectors = attachedWorkerSelectors; } @@ -155,17 +150,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,9 +157,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()); @@ -199,9 +183,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 +197,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,8 +222,7 @@ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) th } } AcsRouterJobClassifiedEventData deserializedAcsRouterJobClassifiedEventData - = new AcsRouterJobClassifiedEventData(labels, tags, queueDetails, attachedWorkerSelectors); - deserializedAcsRouterJobClassifiedEventData.jobId = jobId; + = new AcsRouterJobClassifiedEventData(jobId, labels, tags, queueDetails, attachedWorkerSelectors); deserializedAcsRouterJobClassifiedEventData.channelReference = channelReference; deserializedAcsRouterJobClassifiedEventData.channelId = channelId; deserializedAcsRouterJobClassifiedEventData.queueId = queueId; 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..e53c711d5ea9 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,7 +22,7 @@ public final class AcsRouterJobQueuedEventData extends AcsRouterJobEventData { * Router Job Priority */ @Generated - private Integer priority; + private final int priority; /* * Router Job Queued Attached Worker Selector @@ -54,24 +54,22 @@ 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 priority the priority value to set. * @param attachedWorkerSelectors the attachedWorkerSelectors value to set. * @param requestedWorkerSelectors the requestedWorkerSelectors value to set. */ @Generated - private AcsRouterJobQueuedEventData(Map labels, Map tags, - List attachedWorkerSelectors, List requestedWorkerSelectors) { - super(labels, tags); + private AcsRouterJobQueuedEventData(String jobId, Map labels, Map tags, + int priority, List attachedWorkerSelectors, + List requestedWorkerSelectors) { + super(jobId, labels, tags); + this.priority = priority; this.attachedWorkerSelectors = attachedWorkerSelectors; this.requestedWorkerSelectors = requestedWorkerSelectors; } @@ -82,7 +80,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.writeIntField("priority", this.priority); 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); return jsonWriter.writeEndObject(); } @@ -183,48 +170,46 @@ 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; + AcsRouterJobQueuedEventData deserializedAcsRouterJobQueuedEventData = new AcsRouterJobQueuedEventData(jobId, + labels, tags, priority, attachedWorkerSelectors, requestedWorkerSelectors); deserializedAcsRouterJobQueuedEventData.channelReference = channelReference; deserializedAcsRouterJobQueuedEventData.channelId = channelId; deserializedAcsRouterJobQueuedEventData.queueId = queueId; - deserializedAcsRouterJobQueuedEventData.priority = priority; 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..4b171c89aa6b 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 @@ -75,15 +75,10 @@ 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. @@ -92,10 +87,10 @@ public final class AcsRouterJobReceivedEventData extends AcsRouterJobEventData { * @param unavailableForMatching the unavailableForMatching value to set. */ @Generated - private AcsRouterJobReceivedEventData(Map labels, Map tags, + private AcsRouterJobReceivedEventData(String jobId, Map labels, Map tags, AcsRouterJobStatus jobStatus, List requestedWorkerSelectors, OffsetDateTime scheduledOn, boolean unavailableForMatching) { - super(labels, tags); + super(jobId, labels, tags); this.jobStatus = jobStatus; this.requestedWorkerSelectors = requestedWorkerSelectors; this.scheduledOn = scheduledOn; @@ -195,17 +190,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,9 +197,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()); @@ -242,9 +226,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 +242,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,8 +272,7 @@ public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) thro } } AcsRouterJobReceivedEventData deserializedAcsRouterJobReceivedEventData = new AcsRouterJobReceivedEventData( - labels, tags, jobStatus, requestedWorkerSelectors, scheduledOn, unavailableForMatching); - deserializedAcsRouterJobReceivedEventData.jobId = jobId; + jobId, labels, tags, jobStatus, requestedWorkerSelectors, scheduledOn, unavailableForMatching); deserializedAcsRouterJobReceivedEventData.channelReference = channelReference; deserializedAcsRouterJobReceivedEventData.channelId = channelId; deserializedAcsRouterJobReceivedEventData.queueId = queueId; 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..b81b6cba1720 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,7 +25,7 @@ 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 @@ -69,26 +69,23 @@ 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 priority the priority value to set. * @param expiredAttachedWorkerSelectors the expiredAttachedWorkerSelectors value to set. * @param expiredRequestedWorkerSelectors the expiredRequestedWorkerSelectors value to set. * @param scheduledOn the scheduledOn value to set. */ @Generated - private AcsRouterJobSchedulingFailedEventData(Map labels, Map tags, - List expiredAttachedWorkerSelectors, + private AcsRouterJobSchedulingFailedEventData(String jobId, Map labels, Map tags, + int priority, List expiredAttachedWorkerSelectors, List expiredRequestedWorkerSelectors, OffsetDateTime scheduledOn) { - super(labels, tags); + super(jobId, labels, tags); + this.priority = priority; this.expiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors; this.expiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors; this.scheduledOn = scheduledOn; @@ -100,7 +97,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.writeIntField("priority", this.priority); jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, (writer, element) -> writer.writeJson(element)); jsonWriter.writeArrayField("expiredRequestedWorkerSelectors", this.expiredRequestedWorkerSelectors, (writer, element) -> writer.writeJson(element)); 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 +210,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 +248,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 +255,11 @@ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonRead } } AcsRouterJobSchedulingFailedEventData deserializedAcsRouterJobSchedulingFailedEventData - = new AcsRouterJobSchedulingFailedEventData(labels, tags, expiredAttachedWorkerSelectors, - expiredRequestedWorkerSelectors, scheduledOn); - deserializedAcsRouterJobSchedulingFailedEventData.jobId = jobId; + = new AcsRouterJobSchedulingFailedEventData(jobId, labels, tags, priority, + expiredAttachedWorkerSelectors, expiredRequestedWorkerSelectors, scheduledOn); deserializedAcsRouterJobSchedulingFailedEventData.channelReference = channelReference; deserializedAcsRouterJobSchedulingFailedEventData.channelId = channelId; deserializedAcsRouterJobSchedulingFailedEventData.queueId = queueId; - deserializedAcsRouterJobSchedulingFailedEventData.priority = priority; 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..5f3418dbbd4a 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,7 +25,7 @@ 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 @@ -69,28 +69,25 @@ 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 priority the priority value to set. * @param expiredAttachedWorkerSelectors the expiredAttachedWorkerSelectors value to set. * @param expiredRequestedWorkerSelectors the expiredRequestedWorkerSelectors 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, + private AcsRouterJobWaitingForActivationEventData(String jobId, Map labels, + Map tags, int priority, List expiredAttachedWorkerSelectors, List expiredRequestedWorkerSelectors, OffsetDateTime scheduledOn, boolean unavailableForMatching) { - super(labels, tags); + super(jobId, labels, tags); + this.priority = priority; this.expiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors; this.expiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors; this.scheduledOn = scheduledOn; @@ -103,7 +100,7 @@ private AcsRouterJobWaitingForActivationEventData(Map labels, Ma * @return the priority value. */ @Generated - public Integer getPriority() { + public int getPriority() { return this.priority; } @@ -181,17 +178,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,12 +185,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.writeIntField("priority", this.priority); jsonWriter.writeArrayField("expiredAttachedWorkerSelectors", this.expiredAttachedWorkerSelectors, (writer, element) -> writer.writeJson(element)); jsonWriter.writeArrayField("expiredRequestedWorkerSelectors", this.expiredRequestedWorkerSelectors, @@ -212,7 +199,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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 +214,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 +254,17 @@ 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, + expiredAttachedWorkerSelectors, expiredRequestedWorkerSelectors, scheduledOn, + unavailableForMatching); deserializedAcsRouterJobWaitingForActivationEventData.channelReference = channelReference; deserializedAcsRouterJobWaitingForActivationEventData.channelId = channelId; deserializedAcsRouterJobWaitingForActivationEventData.queueId = queueId; - deserializedAcsRouterJobWaitingForActivationEventData.priority = priority; 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..78464ec2347c 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 @@ -48,25 +48,20 @@ 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, + private AcsRouterJobWorkerSelectorsExpiredEventData(String jobId, Map labels, + Map tags, List expiredRequestedWorkerSelectors, List expiredAttachedWorkerSelectors) { - super(labels, tags); + super(jobId, labels, tags); this.expiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors; this.expiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors; } @@ -124,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} */ @@ -142,9 +126,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()); @@ -167,9 +151,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 +163,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,9 +186,8 @@ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader js } } AcsRouterJobWorkerSelectorsExpiredEventData deserializedAcsRouterJobWorkerSelectorsExpiredEventData - = new AcsRouterJobWorkerSelectorsExpiredEventData(labels, tags, expiredRequestedWorkerSelectors, + = new AcsRouterJobWorkerSelectorsExpiredEventData(jobId, labels, tags, expiredRequestedWorkerSelectors, expiredAttachedWorkerSelectors); - deserializedAcsRouterJobWorkerSelectorsExpiredEventData.jobId = jobId; deserializedAcsRouterJobWorkerSelectorsExpiredEventData.channelReference = channelReference; deserializedAcsRouterJobWorkerSelectorsExpiredEventData.channelId = channelId; deserializedAcsRouterJobWorkerSelectorsExpiredEventData.queueId = queueId; 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/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..ffd2a948a8b4 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,13 +24,13 @@ 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 @@ -50,33 +50,24 @@ 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 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 deliveryAttempts the deliveryAttempts value to set. * @param receivedTimestamp the receivedTimestamp value to set. */ @Generated - private AcsSmsDeliveryReportReceivedEventData(List deliveryAttempts, + private AcsSmsDeliveryReportReceivedEventData(String messageId, String from, String to, String deliveryStatus, + String deliveryStatusDetails, List deliveryAttempts, OffsetDateTime receivedTimestamp) { + super(messageId, from, to); + this.deliveryStatus = deliveryStatus; + this.deliveryStatusDetails = deliveryStatusDetails; this.deliveryAttempts = deliveryAttempts; this.receivedTimestamp = receivedTimestamp; } @@ -131,39 +122,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 +132,14 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("from", getFrom()); jsonWriter.writeStringField("to", getTo()); + jsonWriter.writeStringField("deliveryStatus", this.deliveryStatus); + jsonWriter.writeStringField("deliveryStatusDetails", this.deliveryStatusDetails); jsonWriter.writeArrayField("deliveryAttempts", this.deliveryAttempts, (writer, element) -> writer.writeJson(element)); 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 +159,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 +174,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 +190,8 @@ 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, + deliveryAttempts, receivedTimestamp); 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/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/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..99f5c355b05a 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,19 @@ "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.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 +39,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", diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml index 30acf0918f21..6cb7a804bf3c 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: 9c3f6b6d3178c1634574f23e7e1bb7902799441c repo: Azure/azure-rest-api-specs -additionalDirectories: +additionalDirectories: