diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatAzureBotCommandReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatAzureBotCommandReceivedInThreadEventData.java index 0fc5d4b40db7..625ce16d1092 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatAzureBotCommandReceivedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatAzureBotCommandReceivedInThreadEventData.java @@ -123,7 +123,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedEventData.java index 9a3a8399a15c..79401191b0e6 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedEventData.java @@ -145,7 +145,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageBody", this.messageBody); 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)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedInThreadEventData.java index 9c002ba5396e..96f5989a4a90 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedInThreadEventData.java @@ -142,7 +142,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageBody", this.messageBody); 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)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedEventData.java index 8308799dfbc2..4f54f5bd8075 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedEventData.java @@ -125,7 +125,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedInThreadEventData.java index 857067787f4a..81c4924d0c5e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageReceivedInThreadEventData.java @@ -122,7 +122,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java index 0f6c1b7cef03..695862c29ec5 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java @@ -152,7 +152,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java index 75d88181ae8f..dbbae3eab9df 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java @@ -155,7 +155,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadParticipantProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadParticipantProperties.java index 84902d93485b..37f9433863bf 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadParticipantProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadParticipantProperties.java @@ -85,7 +85,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("participantCommunicationIdentifier", this.participantCommunicationIdentifier); jsonWriter.writeStringField("displayName", this.displayName); - jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java index c6e617a7c38e..b99e076d875b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java @@ -43,7 +43,7 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread * The thread metadata */ @Generated - private final Map metadata; + private Map metadata; /* * The version of the thread @@ -65,17 +65,15 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread * @param editedByCommunicationIdentifier the editedByCommunicationIdentifier value to set. * @param editTime the editTime value to set. * @param properties the properties value to set. - * @param metadata the metadata value to set. */ @Generated private AcsChatThreadPropertiesUpdatedEventData(String threadId, OffsetDateTime createTime, CommunicationIdentifierModel editedByCommunicationIdentifier, OffsetDateTime editTime, - Map properties, Map metadata) { + Map properties) { super(threadId, createTime); this.editedByCommunicationIdentifier = editedByCommunicationIdentifier; this.editTime = editTime; this.properties = properties; - this.metadata = metadata; } /** @@ -158,7 +156,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); 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(); } @@ -210,9 +207,10 @@ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonRe } AcsChatThreadPropertiesUpdatedEventData deserializedAcsChatThreadPropertiesUpdatedEventData = new AcsChatThreadPropertiesUpdatedEventData(threadId, createTime, editedByCommunicationIdentifier, - editTime, properties, metadata); + editTime, properties); deserializedAcsChatThreadPropertiesUpdatedEventData.transactionId = transactionId; deserializedAcsChatThreadPropertiesUpdatedEventData.version = version; + deserializedAcsChatThreadPropertiesUpdatedEventData.metadata = metadata; return deserializedAcsChatThreadPropertiesUpdatedEventData; }); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java index 5fd85b87b32d..a6a0b3f4da9f 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java @@ -160,7 +160,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); 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(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatTypingIndicatorReceivedInThreadEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatTypingIndicatorReceivedInThreadEventData.java index 832a583e2c64..e40ae35d2b89 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatTypingIndicatorReceivedInThreadEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatTypingIndicatorReceivedInThreadEventData.java @@ -123,7 +123,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { 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(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsIncomingCallCustomContext.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsIncomingCallCustomContext.java index 18aeb9c1b3e2..df46bbc15234 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsIncomingCallCustomContext.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsIncomingCallCustomContext.java @@ -22,24 +22,19 @@ public final class AcsIncomingCallCustomContext implements JsonSerializable sipHeaders; + private Map sipHeaders; /* * Voip Headers for incoming call */ @Generated - private final Map voipHeaders; + private Map voipHeaders; /** * Creates an instance of AcsIncomingCallCustomContext class. - * - * @param sipHeaders the sipHeaders value to set. - * @param voipHeaders the voipHeaders value to set. */ @Generated - private AcsIncomingCallCustomContext(Map sipHeaders, Map voipHeaders) { - this.sipHeaders = sipHeaders; - this.voipHeaders = voipHeaders; + private AcsIncomingCallCustomContext() { } /** @@ -69,8 +64,6 @@ public Map getVoipHeaders() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("sipHeaders", this.sipHeaders, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("voipHeaders", this.voipHeaders, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -86,21 +79,23 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsIncomingCallCustomContext fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map sipHeaders = null; - Map voipHeaders = null; + AcsIncomingCallCustomContext deserializedAcsIncomingCallCustomContext = new AcsIncomingCallCustomContext(); while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("sipHeaders".equals(fieldName)) { - sipHeaders = reader.readMap(reader1 -> reader1.getString()); + Map sipHeaders = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsIncomingCallCustomContext.sipHeaders = sipHeaders; } else if ("voipHeaders".equals(fieldName)) { - voipHeaders = reader.readMap(reader1 -> reader1.getString()); + Map voipHeaders = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsIncomingCallCustomContext.voipHeaders = voipHeaders; } else { reader.skipChildren(); } } - return new AcsIncomingCallCustomContext(sipHeaders, voipHeaders); + + return deserializedAcsIncomingCallCustomContext; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCancelledEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCancelledEventData.java index 349df2184dc0..a7f272f02017 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCancelledEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCancelledEventData.java @@ -29,6 +29,18 @@ public final class AcsRouterJobCancelledEventData extends AcsRouterJobEventData @Generated private String dispositionCode; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -51,12 +63,10 @@ public final class AcsRouterJobCancelledEventData extends AcsRouterJobEventData * 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(String jobId, Map labels, Map tags) { - super(jobId, labels, tags); + private AcsRouterJobCancelledEventData(String jobId) { + super(jobId); } /** @@ -79,6 +89,28 @@ public String getDispositionCode() { return this.dispositionCode; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -120,8 +152,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -174,7 +204,9 @@ public static AcsRouterJobCancelledEventData fromJson(JsonReader jsonReader) thr } } AcsRouterJobCancelledEventData deserializedAcsRouterJobCancelledEventData - = new AcsRouterJobCancelledEventData(jobId, labels, tags); + = new AcsRouterJobCancelledEventData(jobId); + deserializedAcsRouterJobCancelledEventData.labels = labels; + deserializedAcsRouterJobCancelledEventData.tags = 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/models/AcsRouterJobClassificationFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClassificationFailedEventData.java index eafedff07d58..68289ed66e89 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClassificationFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClassificationFailedEventData.java @@ -33,6 +33,18 @@ public final class AcsRouterJobClassificationFailedEventData extends AcsRouterJo @Generated private List errors; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -55,13 +67,10 @@ public final class AcsRouterJobClassificationFailedEventData extends AcsRouterJo * 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. */ @Generated - private AcsRouterJobClassificationFailedEventData(String jobId, Map labels, - Map tags) { - super(jobId, labels, tags); + private AcsRouterJobClassificationFailedEventData(String jobId) { + super(jobId); } /** @@ -86,6 +95,28 @@ public List getErrors() { .collect(Collectors.toList()); } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -127,8 +158,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -180,7 +209,9 @@ public static AcsRouterJobClassificationFailedEventData fromJson(JsonReader json } } AcsRouterJobClassificationFailedEventData deserializedAcsRouterJobClassificationFailedEventData - = new AcsRouterJobClassificationFailedEventData(jobId, labels, tags); + = new AcsRouterJobClassificationFailedEventData(jobId); + deserializedAcsRouterJobClassificationFailedEventData.labels = labels; + deserializedAcsRouterJobClassificationFailedEventData.tags = tags; 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/models/AcsRouterJobClassifiedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClassifiedEventData.java index 167b421a74f2..776bad3fdcda 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClassifiedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClassifiedEventData.java @@ -42,6 +42,18 @@ public final class AcsRouterJobClassifiedEventData extends AcsRouterJobEventData @Generated private List attachedWorkerSelectors; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -64,14 +76,11 @@ public final class AcsRouterJobClassifiedEventData extends AcsRouterJobEventData * 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. */ @Generated - private AcsRouterJobClassifiedEventData(String jobId, Map labels, Map tags, - AcsRouterQueueDetails queueDetails) { - super(jobId, labels, tags); + private AcsRouterJobClassifiedEventData(String jobId, AcsRouterQueueDetails queueDetails) { + super(jobId); this.queueDetails = queueDetails; } @@ -115,6 +124,28 @@ public List getAttachedWorkerSelectors() { return this.attachedWorkerSelectors; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -156,8 +187,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -217,7 +246,9 @@ public static AcsRouterJobClassifiedEventData fromJson(JsonReader jsonReader) th } } AcsRouterJobClassifiedEventData deserializedAcsRouterJobClassifiedEventData - = new AcsRouterJobClassifiedEventData(jobId, labels, tags, queueDetails); + = new AcsRouterJobClassifiedEventData(jobId, queueDetails); + deserializedAcsRouterJobClassifiedEventData.labels = labels; + deserializedAcsRouterJobClassifiedEventData.tags = tags; 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/models/AcsRouterJobClosedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClosedEventData.java index af63f53bc1b7..efaf2fc98811 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClosedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobClosedEventData.java @@ -35,6 +35,18 @@ public final class AcsRouterJobClosedEventData extends AcsRouterJobEventData { @Generated private String dispositionCode; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -57,12 +69,10 @@ public final class AcsRouterJobClosedEventData extends AcsRouterJobEventData { * 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(String jobId, Map labels, Map tags) { - super(jobId, labels, tags); + private AcsRouterJobClosedEventData(String jobId) { + super(jobId); } /** @@ -95,6 +105,28 @@ public String getDispositionCode() { return this.dispositionCode; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -136,8 +168,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -194,7 +224,9 @@ public static AcsRouterJobClosedEventData fromJson(JsonReader jsonReader) throws } } AcsRouterJobClosedEventData deserializedAcsRouterJobClosedEventData - = new AcsRouterJobClosedEventData(jobId, labels, tags); + = new AcsRouterJobClosedEventData(jobId); + deserializedAcsRouterJobClosedEventData.labels = labels; + deserializedAcsRouterJobClosedEventData.tags = 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/models/AcsRouterJobCompletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCompletedEventData.java index c7dfd4bd0cb0..dfbf8c4a9c02 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCompletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobCompletedEventData.java @@ -29,6 +29,18 @@ public final class AcsRouterJobCompletedEventData extends AcsRouterJobEventData @Generated private String workerId; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -51,12 +63,10 @@ public final class AcsRouterJobCompletedEventData extends AcsRouterJobEventData * 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(String jobId, Map labels, Map tags) { - super(jobId, labels, tags); + private AcsRouterJobCompletedEventData(String jobId) { + super(jobId); } /** @@ -79,6 +89,28 @@ public String getWorkerId() { return this.workerId; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -120,8 +152,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -174,7 +204,9 @@ public static AcsRouterJobCompletedEventData fromJson(JsonReader jsonReader) thr } } AcsRouterJobCompletedEventData deserializedAcsRouterJobCompletedEventData - = new AcsRouterJobCompletedEventData(jobId, labels, tags); + = new AcsRouterJobCompletedEventData(jobId); + deserializedAcsRouterJobCompletedEventData.labels = labels; + deserializedAcsRouterJobCompletedEventData.tags = 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/models/AcsRouterJobDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobDeletedEventData.java index 308cc775fc27..ae0076a511f5 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobDeletedEventData.java @@ -17,6 +17,18 @@ @Immutable public final class AcsRouterJobDeletedEventData extends AcsRouterJobEventData { + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -39,12 +51,32 @@ public final class AcsRouterJobDeletedEventData extends AcsRouterJobEventData { * 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(String jobId, Map labels, Map tags) { - super(jobId, labels, tags); + private AcsRouterJobDeletedEventData(String jobId) { + super(jobId); + } + + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; } /** @@ -88,8 +120,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -134,7 +164,9 @@ public static AcsRouterJobDeletedEventData fromJson(JsonReader jsonReader) throw } } AcsRouterJobDeletedEventData deserializedAcsRouterJobDeletedEventData - = new AcsRouterJobDeletedEventData(jobId, labels, tags); + = new AcsRouterJobDeletedEventData(jobId); + deserializedAcsRouterJobDeletedEventData.labels = labels; + deserializedAcsRouterJobDeletedEventData.tags = 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/models/AcsRouterJobEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobEventData.java index e02d7fe1c827..1e0a58d6ffc5 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobEventData.java @@ -27,13 +27,13 @@ public class AcsRouterJobEventData extends AcsRouterEventData { * Router Job events Labels */ @Generated - private final Map labels; + private Map labels; /* * Router Jobs events Tags */ @Generated - private final Map tags; + private Map tags; /* * Router Event Channel ID @@ -51,14 +51,10 @@ public class AcsRouterJobEventData extends AcsRouterEventData { * 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(String jobId, Map labels, Map tags) { + protected AcsRouterJobEventData(String jobId) { super(jobId); - this.labels = labels; - this.tags = tags; } /** @@ -93,6 +89,18 @@ public Map getLabels() { return this.labels; } + /** + * Set the labels property: Router Job events Labels. + * + * @param labels the labels value to set. + * @return the AcsRouterJobEventData object itself. + */ + @Generated + AcsRouterJobEventData setLabels(Map labels) { + this.labels = labels; + return this; + } + /** * Get the tags property: Router Jobs events Tags. * @@ -103,6 +111,18 @@ public Map getTags() { return this.tags; } + /** + * Set the tags property: Router Jobs events Tags. + * + * @param tags the tags value to set. + * @return the AcsRouterJobEventData object itself. + */ + @Generated + AcsRouterJobEventData setTags(Map tags) { + this.tags = tags; + return this; + } + /** * Get the channelId property: Router Event Channel ID. * @@ -135,8 +155,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("jobId", getJobId()); jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); - jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("queueId", this.queueId); return jsonWriter.writeEndObject(); } @@ -178,9 +196,11 @@ public static AcsRouterJobEventData fromJson(JsonReader jsonReader) throws IOExc reader.skipChildren(); } } - AcsRouterJobEventData deserializedAcsRouterJobEventData = new AcsRouterJobEventData(jobId, labels, tags); + AcsRouterJobEventData deserializedAcsRouterJobEventData = new AcsRouterJobEventData(jobId); deserializedAcsRouterJobEventData.channelReference = channelReference; deserializedAcsRouterJobEventData.channelId = channelId; + deserializedAcsRouterJobEventData.labels = labels; + deserializedAcsRouterJobEventData.tags = tags; deserializedAcsRouterJobEventData.queueId = queueId; return deserializedAcsRouterJobEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobExceptionTriggeredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobExceptionTriggeredEventData.java index c2ae0fc7f2a6..5c00685c0353 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobExceptionTriggeredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobExceptionTriggeredEventData.java @@ -29,6 +29,18 @@ public final class AcsRouterJobExceptionTriggeredEventData extends AcsRouterJobE @Generated private String exceptionRuleId; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -51,13 +63,10 @@ public final class AcsRouterJobExceptionTriggeredEventData extends AcsRouterJobE * 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(String jobId, Map labels, - Map tags) { - super(jobId, labels, tags); + private AcsRouterJobExceptionTriggeredEventData(String jobId) { + super(jobId); } /** @@ -80,6 +89,28 @@ public String getExceptionRuleId() { return this.exceptionRuleId; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -121,8 +152,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -175,7 +204,9 @@ public static AcsRouterJobExceptionTriggeredEventData fromJson(JsonReader jsonRe } } AcsRouterJobExceptionTriggeredEventData deserializedAcsRouterJobExceptionTriggeredEventData - = new AcsRouterJobExceptionTriggeredEventData(jobId, labels, tags); + = new AcsRouterJobExceptionTriggeredEventData(jobId); + deserializedAcsRouterJobExceptionTriggeredEventData.labels = labels; + deserializedAcsRouterJobExceptionTriggeredEventData.tags = 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/models/AcsRouterJobQueuedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobQueuedEventData.java index 7325efc2b0b4..3fc7b5c0c50a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobQueuedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobQueuedEventData.java @@ -36,6 +36,18 @@ public final class AcsRouterJobQueuedEventData extends AcsRouterJobEventData { @Generated private List requestedWorkerSelectors; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -58,14 +70,11 @@ public final class AcsRouterJobQueuedEventData extends AcsRouterJobEventData { * 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. */ @Generated - private AcsRouterJobQueuedEventData(String jobId, Map labels, Map tags, - int priority) { - super(jobId, labels, tags); + private AcsRouterJobQueuedEventData(String jobId, int priority) { + super(jobId); this.priority = priority; } @@ -99,6 +108,28 @@ public List getRequestedWorkerSelectors() { return this.requestedWorkerSelectors; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -140,8 +171,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -196,7 +225,9 @@ public static AcsRouterJobQueuedEventData fromJson(JsonReader jsonReader) throws } } AcsRouterJobQueuedEventData deserializedAcsRouterJobQueuedEventData - = new AcsRouterJobQueuedEventData(jobId, labels, tags, priority); + = new AcsRouterJobQueuedEventData(jobId, priority); + deserializedAcsRouterJobQueuedEventData.labels = labels; + deserializedAcsRouterJobQueuedEventData.tags = tags; deserializedAcsRouterJobQueuedEventData.channelReference = channelReference; deserializedAcsRouterJobQueuedEventData.channelId = channelId; deserializedAcsRouterJobQueuedEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobReceivedEventData.java index 2d164f3dc982..caa09d7daf97 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobReceivedEventData.java @@ -57,6 +57,18 @@ public final class AcsRouterJobReceivedEventData extends AcsRouterJobEventData { @Generated private final boolean unavailableForMatching; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -79,16 +91,14 @@ public final class AcsRouterJobReceivedEventData extends AcsRouterJobEventData { * Creates an instance of AcsRouterJobReceivedEventData class. * * @param jobId the jobId value to set. - * @param labels the labels value to set. - * @param tags the tags value to set. * @param jobStatus the jobStatus value to set. * @param scheduledOn the scheduledOn value to set. * @param unavailableForMatching the unavailableForMatching value to set. */ @Generated - private AcsRouterJobReceivedEventData(String jobId, Map labels, Map tags, - AcsRouterJobStatus jobStatus, OffsetDateTime scheduledOn, boolean unavailableForMatching) { - super(jobId, labels, tags); + private AcsRouterJobReceivedEventData(String jobId, AcsRouterJobStatus jobStatus, OffsetDateTime scheduledOn, + boolean unavailableForMatching) { + super(jobId); this.jobStatus = jobStatus; this.scheduledOn = scheduledOn; this.unavailableForMatching = unavailableForMatching; @@ -154,6 +164,28 @@ public boolean isUnavailableForMatching() { return this.unavailableForMatching; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -195,8 +227,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -265,8 +295,10 @@ public static AcsRouterJobReceivedEventData fromJson(JsonReader jsonReader) thro reader.skipChildren(); } } - AcsRouterJobReceivedEventData deserializedAcsRouterJobReceivedEventData = new AcsRouterJobReceivedEventData( - jobId, labels, tags, jobStatus, scheduledOn, unavailableForMatching); + AcsRouterJobReceivedEventData deserializedAcsRouterJobReceivedEventData + = new AcsRouterJobReceivedEventData(jobId, jobStatus, scheduledOn, unavailableForMatching); + deserializedAcsRouterJobReceivedEventData.labels = labels; + deserializedAcsRouterJobReceivedEventData.tags = tags; 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/models/AcsRouterJobSchedulingFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobSchedulingFailedEventData.java index 606eeb4ec15b..326341828619 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobSchedulingFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobSchedulingFailedEventData.java @@ -51,6 +51,18 @@ public final class AcsRouterJobSchedulingFailedEventData extends AcsRouterJobEve @Generated private String failureReason; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -73,15 +85,12 @@ public final class AcsRouterJobSchedulingFailedEventData extends AcsRouterJobEve * 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 scheduledOn the scheduledOn value to set. */ @Generated - private AcsRouterJobSchedulingFailedEventData(String jobId, Map labels, Map tags, - int priority, OffsetDateTime scheduledOn) { - super(jobId, labels, tags); + private AcsRouterJobSchedulingFailedEventData(String jobId, int priority, OffsetDateTime scheduledOn) { + super(jobId); this.priority = priority; this.scheduledOn = scheduledOn; } @@ -136,6 +145,28 @@ public String getFailureReason() { return this.failureReason; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -177,8 +208,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -245,7 +274,9 @@ public static AcsRouterJobSchedulingFailedEventData fromJson(JsonReader jsonRead } } AcsRouterJobSchedulingFailedEventData deserializedAcsRouterJobSchedulingFailedEventData - = new AcsRouterJobSchedulingFailedEventData(jobId, labels, tags, priority, scheduledOn); + = new AcsRouterJobSchedulingFailedEventData(jobId, priority, scheduledOn); + deserializedAcsRouterJobSchedulingFailedEventData.labels = labels; + deserializedAcsRouterJobSchedulingFailedEventData.tags = tags; deserializedAcsRouterJobSchedulingFailedEventData.channelReference = channelReference; deserializedAcsRouterJobSchedulingFailedEventData.channelId = channelId; deserializedAcsRouterJobSchedulingFailedEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobUnassignedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobUnassignedEventData.java index 28b9d5242286..9cd3f594acaf 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobUnassignedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobUnassignedEventData.java @@ -29,6 +29,18 @@ public final class AcsRouterJobUnassignedEventData extends AcsRouterJobEventData @Generated private String workerId; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -51,12 +63,10 @@ public final class AcsRouterJobUnassignedEventData extends AcsRouterJobEventData * 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(String jobId, Map labels, Map tags) { - super(jobId, labels, tags); + private AcsRouterJobUnassignedEventData(String jobId) { + super(jobId); } /** @@ -79,6 +89,28 @@ public String getWorkerId() { return this.workerId; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -120,8 +152,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -174,7 +204,9 @@ public static AcsRouterJobUnassignedEventData fromJson(JsonReader jsonReader) th } } AcsRouterJobUnassignedEventData deserializedAcsRouterJobUnassignedEventData - = new AcsRouterJobUnassignedEventData(jobId, labels, tags); + = new AcsRouterJobUnassignedEventData(jobId); + deserializedAcsRouterJobUnassignedEventData.labels = labels; + deserializedAcsRouterJobUnassignedEventData.tags = 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/models/AcsRouterJobWaitingForActivationEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWaitingForActivationEventData.java index 644f7e48ca9b..3a9a6d195096 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWaitingForActivationEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWaitingForActivationEventData.java @@ -51,6 +51,18 @@ public final class AcsRouterJobWaitingForActivationEventData extends AcsRouterJo @Generated private final boolean unavailableForMatching; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -73,16 +85,14 @@ public final class AcsRouterJobWaitingForActivationEventData extends AcsRouterJo * 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 scheduledOn the scheduledOn value to set. * @param unavailableForMatching the unavailableForMatching value to set. */ @Generated - private AcsRouterJobWaitingForActivationEventData(String jobId, Map labels, - Map tags, int priority, OffsetDateTime scheduledOn, boolean unavailableForMatching) { - super(jobId, labels, tags); + private AcsRouterJobWaitingForActivationEventData(String jobId, int priority, OffsetDateTime scheduledOn, + boolean unavailableForMatching) { + super(jobId); this.priority = priority; this.scheduledOn = scheduledOn; this.unavailableForMatching = unavailableForMatching; @@ -139,6 +149,28 @@ public boolean isUnavailableForMatching() { return this.unavailableForMatching; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -180,8 +212,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -248,8 +278,9 @@ public static AcsRouterJobWaitingForActivationEventData fromJson(JsonReader json } } AcsRouterJobWaitingForActivationEventData deserializedAcsRouterJobWaitingForActivationEventData - = new AcsRouterJobWaitingForActivationEventData(jobId, labels, tags, priority, scheduledOn, - unavailableForMatching); + = new AcsRouterJobWaitingForActivationEventData(jobId, priority, scheduledOn, unavailableForMatching); + deserializedAcsRouterJobWaitingForActivationEventData.labels = labels; + deserializedAcsRouterJobWaitingForActivationEventData.tags = tags; deserializedAcsRouterJobWaitingForActivationEventData.channelReference = channelReference; deserializedAcsRouterJobWaitingForActivationEventData.channelId = channelId; deserializedAcsRouterJobWaitingForActivationEventData.queueId = queueId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWorkerSelectorsExpiredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWorkerSelectorsExpiredEventData.java index a65e1d354d69..16511e7c5c33 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWorkerSelectorsExpiredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterJobWorkerSelectorsExpiredEventData.java @@ -30,6 +30,18 @@ public final class AcsRouterJobWorkerSelectorsExpiredEventData extends AcsRouter @Generated private List expiredAttachedWorkerSelectors; + /* + * Router Jobs events Tags + */ + @Generated + private Map tags; + + /* + * Router Job events Labels + */ + @Generated + private Map labels; + /* * Router Job events Queue Id */ @@ -52,13 +64,10 @@ public final class AcsRouterJobWorkerSelectorsExpiredEventData extends AcsRouter * 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. */ @Generated - private AcsRouterJobWorkerSelectorsExpiredEventData(String jobId, Map labels, - Map tags) { - super(jobId, labels, tags); + private AcsRouterJobWorkerSelectorsExpiredEventData(String jobId) { + super(jobId); } /** @@ -81,6 +90,28 @@ public List getExpiredAttachedWorkerSelectors() { return this.expiredAttachedWorkerSelectors; } + /** + * Get the tags property: Router Jobs events Tags. + * + * @return the tags value. + */ + @Generated + @Override + public Map getTags() { + return this.tags; + } + + /** + * Get the labels property: Router Job events Labels. + * + * @return the labels value. + */ + @Generated + @Override + public Map getLabels() { + return this.labels; + } + /** * Get the queueId property: Router Job events Queue Id. * @@ -122,8 +153,6 @@ public String getChannelReference() { 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("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("queueId", getQueueId()); @@ -176,7 +205,9 @@ public static AcsRouterJobWorkerSelectorsExpiredEventData fromJson(JsonReader js } } AcsRouterJobWorkerSelectorsExpiredEventData deserializedAcsRouterJobWorkerSelectorsExpiredEventData - = new AcsRouterJobWorkerSelectorsExpiredEventData(jobId, labels, tags); + = new AcsRouterJobWorkerSelectorsExpiredEventData(jobId); + deserializedAcsRouterJobWorkerSelectorsExpiredEventData.labels = labels; + deserializedAcsRouterJobWorkerSelectorsExpiredEventData.tags = tags; 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/models/AcsRouterQueueDetails.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterQueueDetails.java index cd0114bfc08d..0a4e6e4bd3ac 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterQueueDetails.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterQueueDetails.java @@ -34,16 +34,13 @@ public final class AcsRouterQueueDetails implements JsonSerializable labels; + private Map labels; /** * Creates an instance of AcsRouterQueueDetails class. - * - * @param labels the labels value to set. */ @Generated - private AcsRouterQueueDetails(Map labels) { - this.labels = labels; + private AcsRouterQueueDetails() { } /** @@ -83,7 +80,6 @@ public Map getLabels() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("id", this.id); jsonWriter.writeStringField("name", this.name); return jsonWriter.writeEndObject(); @@ -101,26 +97,22 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterQueueDetails fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map labels = null; - String id = null; - String name = null; + AcsRouterQueueDetails deserializedAcsRouterQueueDetails = new AcsRouterQueueDetails(); while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("labels".equals(fieldName)) { - labels = reader.readMap(reader1 -> reader1.getString()); + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterQueueDetails.labels = labels; } else if ("id".equals(fieldName)) { - id = reader.getString(); + deserializedAcsRouterQueueDetails.id = reader.getString(); } else if ("name".equals(fieldName)) { - name = reader.getString(); + deserializedAcsRouterQueueDetails.name = reader.getString(); } else { reader.skipChildren(); } } - AcsRouterQueueDetails deserializedAcsRouterQueueDetails = new AcsRouterQueueDetails(labels); - deserializedAcsRouterQueueDetails.id = id; - deserializedAcsRouterQueueDetails.name = name; return deserializedAcsRouterQueueDetails; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferAcceptedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferAcceptedEventData.java index 4d6127195d45..46ec92e5160d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferAcceptedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferAcceptedEventData.java @@ -45,25 +45,25 @@ public final class AcsRouterWorkerOfferAcceptedEventData extends AcsRouterWorker * Router Worker Offer Accepted Worker Labels */ @Generated - private final Map workerLabels; + private Map workerLabels; /* * Router Worker Offer Accepted Worker Tags */ @Generated - private final Map workerTags; + private Map workerTags; /* * Router Worker Offer Accepted Job Labels */ @Generated - private final Map jobLabels; + private Map jobLabels; /* * Router Worker Offer Accepted Job Tags */ @Generated - private final Map jobTags; + private Map jobTags; /* * Router Worker events Worker Id @@ -87,19 +87,10 @@ public final class AcsRouterWorkerOfferAcceptedEventData extends AcsRouterWorker * 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(String jobId, Map workerLabels, - Map workerTags, Map jobLabels, Map jobTags) { + private AcsRouterWorkerOfferAcceptedEventData(String jobId) { super(jobId); - this.workerLabels = workerLabels; - this.workerTags = workerTags; - this.jobLabels = jobLabels; - this.jobTags = jobTags; } /** @@ -226,10 +217,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("workerId", getWorkerId()); - jsonWriter.writeMapField("workerLabels", this.workerLabels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("workerTags", this.workerTags, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("jobLabels", this.jobLabels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("jobTags", this.jobTags, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("queueId", this.queueId); jsonWriter.writeStringField("offerId", this.offerId); jsonWriter.writeStringField("assignmentId", this.assignmentId); @@ -293,10 +280,14 @@ public static AcsRouterWorkerOfferAcceptedEventData fromJson(JsonReader jsonRead } } AcsRouterWorkerOfferAcceptedEventData deserializedAcsRouterWorkerOfferAcceptedEventData - = new AcsRouterWorkerOfferAcceptedEventData(jobId, workerLabels, workerTags, jobLabels, jobTags); + = new AcsRouterWorkerOfferAcceptedEventData(jobId); deserializedAcsRouterWorkerOfferAcceptedEventData.channelReference = channelReference; deserializedAcsRouterWorkerOfferAcceptedEventData.channelId = channelId; deserializedAcsRouterWorkerOfferAcceptedEventData.workerId = workerId; + deserializedAcsRouterWorkerOfferAcceptedEventData.workerLabels = workerLabels; + deserializedAcsRouterWorkerOfferAcceptedEventData.workerTags = workerTags; + deserializedAcsRouterWorkerOfferAcceptedEventData.jobLabels = jobLabels; + deserializedAcsRouterWorkerOfferAcceptedEventData.jobTags = jobTags; deserializedAcsRouterWorkerOfferAcceptedEventData.queueId = queueId; deserializedAcsRouterWorkerOfferAcceptedEventData.offerId = offerId; deserializedAcsRouterWorkerOfferAcceptedEventData.assignmentId = assignmentId; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferIssuedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferIssuedEventData.java index 8e8d1a5d835b..593b568a66e8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferIssuedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerOfferIssuedEventData.java @@ -42,7 +42,7 @@ public final class AcsRouterWorkerOfferIssuedEventData extends AcsRouterWorkerEv * Router Worker Offer Issued Worker Labels */ @Generated - private final Map workerLabels; + private Map workerLabels; /* * Router Worker Offer Issued Time in UTC @@ -60,19 +60,19 @@ public final class AcsRouterWorkerOfferIssuedEventData extends AcsRouterWorkerEv * Router Worker Offer Issued Worker Tags */ @Generated - private final Map workerTags; + private Map workerTags; /* * Router Worker Offer Issued Job Labels */ @Generated - private final Map jobLabels; + private Map jobLabels; /* * Router Worker Offer Issued Job Tags */ @Generated - private final Map jobTags; + private Map jobTags; /* * Router Worker events Worker Id @@ -96,24 +96,14 @@ public final class AcsRouterWorkerOfferIssuedEventData extends AcsRouterWorkerEv * 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. - * @param workerTags the workerTags value to set. - * @param jobLabels the jobLabels value to set. - * @param jobTags the jobTags value to set. */ @Generated - private AcsRouterWorkerOfferIssuedEventData(String jobId, Map workerLabels, - OffsetDateTime offeredOn, OffsetDateTime expiresOn, Map workerTags, - Map jobLabels, Map jobTags) { + private AcsRouterWorkerOfferIssuedEventData(String jobId, OffsetDateTime offeredOn, OffsetDateTime expiresOn) { super(jobId); - this.workerLabels = workerLabels; this.offeredOn = offeredOn; this.expiresOn = expiresOn; - this.workerTags = workerTags; - this.jobLabels = jobLabels; - this.jobTags = jobTags; } /** @@ -250,14 +240,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("channelReference", getChannelReference()); jsonWriter.writeStringField("channelId", getChannelId()); jsonWriter.writeStringField("workerId", getWorkerId()); - jsonWriter.writeMapField("workerLabels", this.workerLabels, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("offeredOn", this.offeredOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.offeredOn)); jsonWriter.writeStringField("expiresOn", this.expiresOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.expiresOn)); - jsonWriter.writeMapField("workerTags", this.workerTags, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("jobLabels", this.jobLabels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("jobTags", this.jobTags, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("queueId", this.queueId); jsonWriter.writeStringField("offerId", this.offerId); jsonWriter.writeNumberField("jobPriority", this.jobPriority); @@ -325,11 +311,14 @@ public static AcsRouterWorkerOfferIssuedEventData fromJson(JsonReader jsonReader } } AcsRouterWorkerOfferIssuedEventData deserializedAcsRouterWorkerOfferIssuedEventData - = new AcsRouterWorkerOfferIssuedEventData(jobId, workerLabels, offeredOn, expiresOn, workerTags, - jobLabels, jobTags); + = new AcsRouterWorkerOfferIssuedEventData(jobId, offeredOn, expiresOn); deserializedAcsRouterWorkerOfferIssuedEventData.channelReference = channelReference; deserializedAcsRouterWorkerOfferIssuedEventData.channelId = channelId; deserializedAcsRouterWorkerOfferIssuedEventData.workerId = workerId; + deserializedAcsRouterWorkerOfferIssuedEventData.workerLabels = workerLabels; + deserializedAcsRouterWorkerOfferIssuedEventData.workerTags = workerTags; + deserializedAcsRouterWorkerOfferIssuedEventData.jobLabels = jobLabels; + deserializedAcsRouterWorkerOfferIssuedEventData.jobTags = jobTags; deserializedAcsRouterWorkerOfferIssuedEventData.queueId = queueId; deserializedAcsRouterWorkerOfferIssuedEventData.offerId = offerId; deserializedAcsRouterWorkerOfferIssuedEventData.jobPriority = jobPriority; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerRegisteredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerRegisteredEventData.java index 7b532dc1de61..9035521310b0 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerRegisteredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerRegisteredEventData.java @@ -47,24 +47,19 @@ public final class AcsRouterWorkerRegisteredEventData implements JsonSerializabl * Router Worker Registered Labels */ @Generated - private final Map labels; + private Map labels; /* * Router Worker Registered Tags */ @Generated - private final Map tags; + private Map tags; /** * Creates an instance of AcsRouterWorkerRegisteredEventData class. - * - * @param labels the labels value to set. - * @param tags the tags value to set. */ @Generated - private AcsRouterWorkerRegisteredEventData(Map labels, Map tags) { - this.labels = labels; - this.tags = tags; + private AcsRouterWorkerRegisteredEventData() { } /** @@ -134,8 +129,6 @@ public Map getTags() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("workerId", this.workerId); jsonWriter.writeNumberField("totalCapacity", this.totalCapacity); return jsonWriter.writeEndObject(); @@ -153,38 +146,34 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterWorkerRegisteredEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List queueAssignments = null; - List channelConfigurations = null; - Map labels = null; - Map tags = null; - String workerId = null; - Integer totalCapacity = null; + AcsRouterWorkerRegisteredEventData deserializedAcsRouterWorkerRegisteredEventData + = new AcsRouterWorkerRegisteredEventData(); while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("queueAssignments".equals(fieldName)) { - queueAssignments = reader.readArray(reader1 -> AcsRouterQueueDetails.fromJson(reader1)); + List queueAssignments + = reader.readArray(reader1 -> AcsRouterQueueDetails.fromJson(reader1)); + deserializedAcsRouterWorkerRegisteredEventData.queueAssignments = queueAssignments; } else if ("channelConfigurations".equals(fieldName)) { - channelConfigurations + List channelConfigurations = reader.readArray(reader1 -> AcsRouterChannelConfiguration.fromJson(reader1)); + deserializedAcsRouterWorkerRegisteredEventData.channelConfigurations = channelConfigurations; } else if ("labels".equals(fieldName)) { - labels = reader.readMap(reader1 -> reader1.getString()); + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterWorkerRegisteredEventData.labels = labels; } else if ("tags".equals(fieldName)) { - tags = reader.readMap(reader1 -> reader1.getString()); + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterWorkerRegisteredEventData.tags = tags; } else if ("workerId".equals(fieldName)) { - workerId = reader.getString(); + deserializedAcsRouterWorkerRegisteredEventData.workerId = reader.getString(); } else if ("totalCapacity".equals(fieldName)) { - totalCapacity = reader.getNullable(JsonReader::getInt); + deserializedAcsRouterWorkerRegisteredEventData.totalCapacity + = reader.getNullable(JsonReader::getInt); } else { reader.skipChildren(); } } - AcsRouterWorkerRegisteredEventData deserializedAcsRouterWorkerRegisteredEventData - = new AcsRouterWorkerRegisteredEventData(labels, tags); - deserializedAcsRouterWorkerRegisteredEventData.queueAssignments = queueAssignments; - deserializedAcsRouterWorkerRegisteredEventData.channelConfigurations = channelConfigurations; - deserializedAcsRouterWorkerRegisteredEventData.workerId = workerId; - deserializedAcsRouterWorkerRegisteredEventData.totalCapacity = totalCapacity; return deserializedAcsRouterWorkerRegisteredEventData; }); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerUpdatedEventData.java index 95222488fa13..db2700195e15 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsRouterWorkerUpdatedEventData.java @@ -47,13 +47,13 @@ public final class AcsRouterWorkerUpdatedEventData implements JsonSerializable labels; + private Map labels; /* * Router Worker Updated Tags */ @Generated - private final Map tags; + private Map tags; /* * Router Worker Properties Updated @@ -63,14 +63,9 @@ public final class AcsRouterWorkerUpdatedEventData implements JsonSerializable labels, Map tags) { - this.labels = labels; - this.tags = tags; + private AcsRouterWorkerUpdatedEventData() { } /** @@ -150,8 +145,6 @@ public List getUpdatedWorkerProperties() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("workerId", this.workerId); jsonWriter.writeNumberField("totalCapacity", this.totalCapacity); return jsonWriter.writeEndObject(); @@ -169,43 +162,37 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static AcsRouterWorkerUpdatedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List queueAssignments = null; - List channelConfigurations = null; - Map labels = null; - Map tags = null; - List updatedWorkerProperties = null; - String workerId = null; - Integer totalCapacity = null; + AcsRouterWorkerUpdatedEventData deserializedAcsRouterWorkerUpdatedEventData + = new AcsRouterWorkerUpdatedEventData(); while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("queueAssignments".equals(fieldName)) { - queueAssignments = reader.readArray(reader1 -> AcsRouterQueueDetails.fromJson(reader1)); + List queueAssignments + = reader.readArray(reader1 -> AcsRouterQueueDetails.fromJson(reader1)); + deserializedAcsRouterWorkerUpdatedEventData.queueAssignments = queueAssignments; } else if ("channelConfigurations".equals(fieldName)) { - channelConfigurations + List channelConfigurations = reader.readArray(reader1 -> AcsRouterChannelConfiguration.fromJson(reader1)); + deserializedAcsRouterWorkerUpdatedEventData.channelConfigurations = channelConfigurations; } else if ("labels".equals(fieldName)) { - labels = reader.readMap(reader1 -> reader1.getString()); + Map labels = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterWorkerUpdatedEventData.labels = labels; } else if ("tags".equals(fieldName)) { - tags = reader.readMap(reader1 -> reader1.getString()); + Map tags = reader.readMap(reader1 -> reader1.getString()); + deserializedAcsRouterWorkerUpdatedEventData.tags = tags; } else if ("updatedWorkerProperties".equals(fieldName)) { - updatedWorkerProperties + List updatedWorkerProperties = reader.readArray(reader1 -> AcsRouterUpdatedWorkerProperty.fromString(reader1.getString())); + deserializedAcsRouterWorkerUpdatedEventData.updatedWorkerProperties = updatedWorkerProperties; } else if ("workerId".equals(fieldName)) { - workerId = reader.getString(); + deserializedAcsRouterWorkerUpdatedEventData.workerId = reader.getString(); } else if ("totalCapacity".equals(fieldName)) { - totalCapacity = reader.getNullable(JsonReader::getInt); + deserializedAcsRouterWorkerUpdatedEventData.totalCapacity = reader.getNullable(JsonReader::getInt); } else { reader.skipChildren(); } } - AcsRouterWorkerUpdatedEventData deserializedAcsRouterWorkerUpdatedEventData - = new AcsRouterWorkerUpdatedEventData(labels, tags); - deserializedAcsRouterWorkerUpdatedEventData.queueAssignments = queueAssignments; - deserializedAcsRouterWorkerUpdatedEventData.channelConfigurations = channelConfigurations; - deserializedAcsRouterWorkerUpdatedEventData.updatedWorkerProperties = updatedWorkerProperties; - deserializedAcsRouterWorkerUpdatedEventData.workerId = workerId; - deserializedAcsRouterWorkerUpdatedEventData.totalCapacity = totalCapacity; return deserializedAcsRouterWorkerUpdatedEventData; }); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AvsScriptExecutionFinishedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AvsScriptExecutionFinishedEventData.java index 2118bffbd47d..855b6ed74be1 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AvsScriptExecutionFinishedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AvsScriptExecutionFinishedEventData.java @@ -22,7 +22,7 @@ public final class AvsScriptExecutionFinishedEventData extends AvsScriptExecutio * Named outputs of completed execution, if any. */ @Generated - private final Map namedOutputs; + private Map namedOutputs; /* * Stdout outputs from the execution, if any. @@ -35,12 +35,10 @@ public final class AvsScriptExecutionFinishedEventData extends AvsScriptExecutio * * @param operationId the operationId value to set. * @param cmdletId the cmdletId value to set. - * @param namedOutputs the namedOutputs value to set. */ @Generated - private AvsScriptExecutionFinishedEventData(String operationId, String cmdletId, Map namedOutputs) { + private AvsScriptExecutionFinishedEventData(String operationId, String cmdletId) { super(operationId, cmdletId); - this.namedOutputs = namedOutputs; } /** @@ -73,7 +71,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operationId", getOperationId()); jsonWriter.writeStringField("cmdletId", getCmdletId()); - jsonWriter.writeMapField("namedOutputs", this.namedOutputs, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -109,8 +106,9 @@ public static AvsScriptExecutionFinishedEventData fromJson(JsonReader jsonReader } } AvsScriptExecutionFinishedEventData deserializedAvsScriptExecutionFinishedEventData - = new AvsScriptExecutionFinishedEventData(operationId, cmdletId, namedOutputs); + = new AvsScriptExecutionFinishedEventData(operationId, cmdletId); deserializedAvsScriptExecutionFinishedEventData.output = output; + deserializedAvsScriptExecutionFinishedEventData.namedOutputs = namedOutputs; return deserializedAvsScriptExecutionFinishedEventData; }); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java index f6d17b927f36..49bb8aba4acf 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java @@ -29,27 +29,22 @@ public class DeviceTelemetryEventProperties implements JsonSerializable properties; + private Map properties; /* * System properties help identify contents and source of the messages. */ @Generated - private final Map systemProperties; + private Map systemProperties; /** * Creates an instance of DeviceTelemetryEventProperties class. * * @param body the body value to set. - * @param properties the properties value to set. - * @param systemProperties the systemProperties value to set. */ @Generated - protected DeviceTelemetryEventProperties(Map body, Map properties, - Map systemProperties) { + protected DeviceTelemetryEventProperties(Map body) { this.body = body; - this.properties = properties; - this.systemProperties = systemProperties; } /** @@ -73,6 +68,19 @@ public Map getProperties() { return this.properties; } + /** + * Set the properties property: Application properties are user-defined strings that can be added to the message. + * These fields are optional. + * + * @param properties the properties value to set. + * @return the DeviceTelemetryEventProperties object itself. + */ + @Generated + DeviceTelemetryEventProperties setProperties(Map properties) { + this.properties = properties; + return this; + } + /** * Get the systemProperties property: System properties help identify contents and source of the messages. * @@ -83,6 +91,18 @@ public Map getSystemProperties() { return this.systemProperties; } + /** + * Set the systemProperties property: System properties help identify contents and source of the messages. + * + * @param systemProperties the systemProperties value to set. + * @return the DeviceTelemetryEventProperties object itself. + */ + @Generated + DeviceTelemetryEventProperties setSystemProperties(Map systemProperties) { + this.systemProperties = systemProperties; + return this; + } + /** * {@inheritDoc} */ @@ -92,9 +112,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeMapField("body", this.body, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("systemProperties", this.systemProperties, - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -128,7 +145,12 @@ public static DeviceTelemetryEventProperties fromJson(JsonReader jsonReader) thr reader.skipChildren(); } } - return new DeviceTelemetryEventProperties(body, properties, systemProperties); + DeviceTelemetryEventProperties deserializedDeviceTelemetryEventProperties + = new DeviceTelemetryEventProperties(body); + deserializedDeviceTelemetryEventProperties.properties = properties; + deserializedDeviceTelemetryEventProperties.systemProperties = systemProperties; + + return deserializedDeviceTelemetryEventProperties; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/EventGridMqttClientCreatedOrUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/EventGridMqttClientCreatedOrUpdatedEventData.java index 555bf7557111..b1051c7375b9 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/EventGridMqttClientCreatedOrUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/EventGridMqttClientCreatedOrUpdatedEventData.java @@ -44,7 +44,7 @@ public final class EventGridMqttClientCreatedOrUpdatedEventData extends EventGri * The key-value attributes that are assigned to the client resource. */ @Generated - private final Map attributes; + private Map attributes; /* * Name of the client resource in the Event Grid namespace. @@ -60,17 +60,14 @@ public final class EventGridMqttClientCreatedOrUpdatedEventData extends EventGri * @param state the state value to set. * @param createdOn the createdOn value to set. * @param updatedOn the updatedOn value to set. - * @param attributes the attributes value to set. */ @Generated private EventGridMqttClientCreatedOrUpdatedEventData(String clientAuthenticationName, String namespaceName, - EventGridMqttClientState state, OffsetDateTime createdOn, OffsetDateTime updatedOn, - Map attributes) { + EventGridMqttClientState state, OffsetDateTime createdOn, OffsetDateTime updatedOn) { super(clientAuthenticationName, namespaceName); this.state = state; this.createdOn = createdOn; this.updatedOn = updatedOn; - this.attributes = attributes; } /** @@ -141,7 +138,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { this.createdOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdOn)); jsonWriter.writeStringField("updatedOn", this.updatedOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.updatedOn)); - jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -189,8 +185,9 @@ public static EventGridMqttClientCreatedOrUpdatedEventData fromJson(JsonReader j } EventGridMqttClientCreatedOrUpdatedEventData deserializedEventGridMqttClientCreatedOrUpdatedEventData = new EventGridMqttClientCreatedOrUpdatedEventData(clientAuthenticationName, namespaceName, state, - createdOn, updatedOn, attributes); + createdOn, updatedOn); deserializedEventGridMqttClientCreatedOrUpdatedEventData.clientName = clientName; + deserializedEventGridMqttClientCreatedOrUpdatedEventData.attributes = attributes; return deserializedEventGridMqttClientCreatedOrUpdatedEventData; }); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java index 2d73bedff3bd..110fac523573 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java @@ -18,17 +18,49 @@ @Immutable public final class IotHubDeviceTelemetryEventData extends DeviceTelemetryEventProperties { + /* + * System properties help identify contents and source of the messages. + */ + @Generated + private Map systemProperties; + + /* + * Application properties are user-defined strings that can be added to the message. These fields are optional. + */ + @Generated + private Map properties; + /** * Creates an instance of IotHubDeviceTelemetryEventData class. * * @param body the body value to set. - * @param properties the properties value to set. - * @param systemProperties the systemProperties value to set. */ @Generated - private IotHubDeviceTelemetryEventData(Map body, Map properties, - Map systemProperties) { - super(body, properties, systemProperties); + private IotHubDeviceTelemetryEventData(Map body) { + super(body); + } + + /** + * Get the systemProperties property: System properties help identify contents and source of the messages. + * + * @return the systemProperties value. + */ + @Generated + @Override + public Map getSystemProperties() { + return this.systemProperties; + } + + /** + * Get the properties property: Application properties are user-defined strings that can be added to the message. + * These fields are optional. + * + * @return the properties value. + */ + @Generated + @Override + public Map getProperties() { + return this.properties; } /** @@ -40,9 +72,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeMapField("body", getBody(), (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("properties", getProperties(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("systemProperties", getSystemProperties(), - (writer, element) -> writer.writeString(element)); return jsonWriter.writeEndObject(); } @@ -75,7 +104,11 @@ public static IotHubDeviceTelemetryEventData fromJson(JsonReader jsonReader) thr reader.skipChildren(); } } - return new IotHubDeviceTelemetryEventData(body, properties, systemProperties); + IotHubDeviceTelemetryEventData deserializedIotHubDeviceTelemetryEventData + = new IotHubDeviceTelemetryEventData(body); + deserializedIotHubDeviceTelemetryEventData.properties = properties; + deserializedIotHubDeviceTelemetryEventData.systemProperties = systemProperties; + return deserializedIotHubDeviceTelemetryEventData; }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionCancelEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionCancelEventData.java index 896e067197ca..50123ddda4b1 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionCancelEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionCancelEventData.java @@ -71,7 +71,7 @@ public final class ResourceActionCancelEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceActionCancelEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceActionCancelEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceActionCancelEventData fromJson(JsonReader jsonReader) thro } } ResourceActionCancelEventData deserializedResourceActionCancelEventData - = new ResourceActionCancelEventData(authorization, claims, httpRequest); + = new ResourceActionCancelEventData(authorization, httpRequest); + deserializedResourceActionCancelEventData.claims = claims; deserializedResourceActionCancelEventData.tenantId = tenantId; deserializedResourceActionCancelEventData.subscriptionId = subscriptionId; deserializedResourceActionCancelEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionFailureEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionFailureEventData.java index 08316ae1121c..c0c49ec03ae3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionFailureEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionFailureEventData.java @@ -71,7 +71,7 @@ public final class ResourceActionFailureEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceActionFailureEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceActionFailureEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceActionFailureEventData fromJson(JsonReader jsonReader) thr } } ResourceActionFailureEventData deserializedResourceActionFailureEventData - = new ResourceActionFailureEventData(authorization, claims, httpRequest); + = new ResourceActionFailureEventData(authorization, httpRequest); + deserializedResourceActionFailureEventData.claims = claims; deserializedResourceActionFailureEventData.tenantId = tenantId; deserializedResourceActionFailureEventData.subscriptionId = subscriptionId; deserializedResourceActionFailureEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionSuccessEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionSuccessEventData.java index 8172ff0a2ec9..d8494c5e4709 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionSuccessEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceActionSuccessEventData.java @@ -71,7 +71,7 @@ public final class ResourceActionSuccessEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceActionSuccessEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceActionSuccessEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceActionSuccessEventData fromJson(JsonReader jsonReader) thr } } ResourceActionSuccessEventData deserializedResourceActionSuccessEventData - = new ResourceActionSuccessEventData(authorization, claims, httpRequest); + = new ResourceActionSuccessEventData(authorization, httpRequest); + deserializedResourceActionSuccessEventData.claims = claims; deserializedResourceActionSuccessEventData.tenantId = tenantId; deserializedResourceActionSuccessEventData.subscriptionId = subscriptionId; deserializedResourceActionSuccessEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceAuthorization.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceAuthorization.java index ea3b37b52abc..8b38ebb95892 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceAuthorization.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceAuthorization.java @@ -34,16 +34,13 @@ public final class ResourceAuthorization implements JsonSerializable evidence; + private Map evidence; /** * Creates an instance of ResourceAuthorization class. - * - * @param evidence the evidence value to set. */ @Generated - private ResourceAuthorization(Map evidence) { - this.evidence = evidence; + private ResourceAuthorization() { } /** @@ -83,7 +80,6 @@ public Map getEvidence() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("evidence", this.evidence, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("scope", this.scope); jsonWriter.writeStringField("action", this.action); return jsonWriter.writeEndObject(); @@ -101,26 +97,22 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static ResourceAuthorization fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map evidence = null; - String scope = null; - String action = null; + ResourceAuthorization deserializedResourceAuthorization = new ResourceAuthorization(); while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("evidence".equals(fieldName)) { - evidence = reader.readMap(reader1 -> reader1.getString()); + Map evidence = reader.readMap(reader1 -> reader1.getString()); + deserializedResourceAuthorization.evidence = evidence; } else if ("scope".equals(fieldName)) { - scope = reader.getString(); + deserializedResourceAuthorization.scope = reader.getString(); } else if ("action".equals(fieldName)) { - action = reader.getString(); + deserializedResourceAuthorization.action = reader.getString(); } else { reader.skipChildren(); } } - ResourceAuthorization deserializedResourceAuthorization = new ResourceAuthorization(evidence); - deserializedResourceAuthorization.scope = scope; - deserializedResourceAuthorization.action = action; return deserializedResourceAuthorization; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteCancelEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteCancelEventData.java index 07cf7c16f490..454c97dea4d2 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteCancelEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteCancelEventData.java @@ -71,7 +71,7 @@ public final class ResourceDeleteCancelEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceDeleteCancelEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceDeleteCancelEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceDeleteCancelEventData fromJson(JsonReader jsonReader) thro } } ResourceDeleteCancelEventData deserializedResourceDeleteCancelEventData - = new ResourceDeleteCancelEventData(authorization, claims, httpRequest); + = new ResourceDeleteCancelEventData(authorization, httpRequest); + deserializedResourceDeleteCancelEventData.claims = claims; deserializedResourceDeleteCancelEventData.tenantId = tenantId; deserializedResourceDeleteCancelEventData.subscriptionId = subscriptionId; deserializedResourceDeleteCancelEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteFailureEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteFailureEventData.java index 8daecb8d113f..d1d0d581cfee 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteFailureEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteFailureEventData.java @@ -71,7 +71,7 @@ public final class ResourceDeleteFailureEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceDeleteFailureEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceDeleteFailureEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceDeleteFailureEventData fromJson(JsonReader jsonReader) thr } } ResourceDeleteFailureEventData deserializedResourceDeleteFailureEventData - = new ResourceDeleteFailureEventData(authorization, claims, httpRequest); + = new ResourceDeleteFailureEventData(authorization, httpRequest); + deserializedResourceDeleteFailureEventData.claims = claims; deserializedResourceDeleteFailureEventData.tenantId = tenantId; deserializedResourceDeleteFailureEventData.subscriptionId = subscriptionId; deserializedResourceDeleteFailureEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteSuccessEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteSuccessEventData.java index 23f5ab8648e5..a7d194aa7b7a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteSuccessEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceDeleteSuccessEventData.java @@ -71,7 +71,7 @@ public final class ResourceDeleteSuccessEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceDeleteSuccessEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceDeleteSuccessEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceDeleteSuccessEventData fromJson(JsonReader jsonReader) thr } } ResourceDeleteSuccessEventData deserializedResourceDeleteSuccessEventData - = new ResourceDeleteSuccessEventData(authorization, claims, httpRequest); + = new ResourceDeleteSuccessEventData(authorization, httpRequest); + deserializedResourceDeleteSuccessEventData.claims = claims; deserializedResourceDeleteSuccessEventData.tenantId = tenantId; deserializedResourceDeleteSuccessEventData.subscriptionId = subscriptionId; deserializedResourceDeleteSuccessEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceNotificationsResourceUpdatedDetails.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceNotificationsResourceUpdatedDetails.java index 490429baf2a6..7d601b4edbdf 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceNotificationsResourceUpdatedDetails.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceNotificationsResourceUpdatedDetails.java @@ -142,9 +142,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("name", this.name); jsonWriter.writeStringField("type", this.type); jsonWriter.writeStringField("location", this.location); - jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteCancelEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteCancelEventData.java index 983760bafe9f..4600c16ef0bb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteCancelEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteCancelEventData.java @@ -71,7 +71,7 @@ public final class ResourceWriteCancelEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceWriteCancelEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceWriteCancelEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceWriteCancelEventData fromJson(JsonReader jsonReader) throw } } ResourceWriteCancelEventData deserializedResourceWriteCancelEventData - = new ResourceWriteCancelEventData(authorization, claims, httpRequest); + = new ResourceWriteCancelEventData(authorization, httpRequest); + deserializedResourceWriteCancelEventData.claims = claims; deserializedResourceWriteCancelEventData.tenantId = tenantId; deserializedResourceWriteCancelEventData.subscriptionId = subscriptionId; deserializedResourceWriteCancelEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteFailureEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteFailureEventData.java index a5707f9891b7..88c93376d29e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteFailureEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteFailureEventData.java @@ -71,7 +71,7 @@ public final class ResourceWriteFailureEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceWriteFailureEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceWriteFailureEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceWriteFailureEventData fromJson(JsonReader jsonReader) thro } } ResourceWriteFailureEventData deserializedResourceWriteFailureEventData - = new ResourceWriteFailureEventData(authorization, claims, httpRequest); + = new ResourceWriteFailureEventData(authorization, httpRequest); + deserializedResourceWriteFailureEventData.claims = claims; deserializedResourceWriteFailureEventData.tenantId = tenantId; deserializedResourceWriteFailureEventData.subscriptionId = subscriptionId; deserializedResourceWriteFailureEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteSuccessEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteSuccessEventData.java index 105361bc918b..f4a0afc7c5fb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteSuccessEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ResourceWriteSuccessEventData.java @@ -71,7 +71,7 @@ public final class ResourceWriteSuccessEventData implements JsonSerializable claims; + private Map claims; /* * An operation ID used for troubleshooting. @@ -89,14 +89,11 @@ public final class ResourceWriteSuccessEventData implements JsonSerializable claims, - ResourceHttpRequest httpRequest) { + private ResourceWriteSuccessEventData(ResourceAuthorization authorization, ResourceHttpRequest httpRequest) { this.authorization = authorization; - this.claims = claims; this.httpRequest = httpRequest; } @@ -218,7 +215,6 @@ public ResourceHttpRequest getHttpRequest() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeJsonField("authorization", this.authorization); - jsonWriter.writeMapField("claims", this.claims, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("httpRequest", this.httpRequest); jsonWriter.writeStringField("tenantId", this.tenantId); jsonWriter.writeStringField("subscriptionId", this.subscriptionId); @@ -284,7 +280,8 @@ public static ResourceWriteSuccessEventData fromJson(JsonReader jsonReader) thro } } ResourceWriteSuccessEventData deserializedResourceWriteSuccessEventData - = new ResourceWriteSuccessEventData(authorization, claims, httpRequest); + = new ResourceWriteSuccessEventData(authorization, httpRequest); + deserializedResourceWriteSuccessEventData.claims = claims; deserializedResourceWriteSuccessEventData.tenantId = tenantId; deserializedResourceWriteSuccessEventData.subscriptionId = subscriptionId; deserializedResourceWriteSuccessEventData.resourceGroup = resourceGroup; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml index 044a1fd25cea..9575dbe094d8 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: f8b7dc62577dae7ded57af5d0bca1f0ef8c4b213 +commit: 32fcae09702e3fce609155c9024b52c0232c8a4e repo: Azure/azure-rest-api-specs additionalDirectories: