Changes for readonly properties

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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<String, String> metadata;
+    private Map<String, String> 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<String, BinaryData> properties, Map<String, String> metadata) {
+        Map<String, BinaryData> 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;
         });
     }

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();
     }
 

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();
     }
 

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<AcsI
      * Sip Headers for incoming call
      */
     @Generated
-    private final Map<String, String> sipHeaders;
+    private Map<String, String> sipHeaders;
 
     /*
      * Voip Headers for incoming call
      */
     @Generated
-    private final Map<String, String> voipHeaders;
+    private Map<String, String> 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<String, String> sipHeaders, Map<String, String> voipHeaders) {
-        this.sipHeaders = sipHeaders;
-        this.voipHeaders = voipHeaders;
+    private AcsIncomingCallCustomContext() {
     }
 
     /**
@@ -69,8 +64,6 @@ public Map<String, String> 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<String, String> sipHeaders = null;
-            Map<String, String> 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<String, String> sipHeaders = reader.readMap(reader1 -> reader1.getString());
+                    deserializedAcsIncomingCallCustomContext.sipHeaders = sipHeaders;
                 } else if ("voipHeaders".equals(fieldName)) {
-                    voipHeaders = reader.readMap(reader1 -> reader1.getString());
+                    Map<String, String> voipHeaders = reader.readMap(reader1 -> reader1.getString());
+                    deserializedAcsIncomingCallCustomContext.voipHeaders = voipHeaders;
                 } else {
                     reader.skipChildren();
                 }
             }
-            return new AcsIncomingCallCustomContext(sipHeaders, voipHeaders);
+
+            return deserializedAcsIncomingCallCustomContext;
         });
     }
 }

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<String, String> tags;
+
+    /*
+     * Router Job events Labels
+     */
+    @Generated
+    private Map<String, String> 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<String, String> labels, Map<String, String> 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<String, String> getTags() {
+        return this.tags;
+    }
+
+    /**
+     * Get the labels property: Router Job events Labels.
+     *
+     * @return the labels value.
+     */
+    @Generated
+    @Override
+    public Map<String, String> 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;

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<AcsRouterCommunicationError> errors;
 
+    /*
+     * Router Jobs events Tags
+     */
+    @Generated
+    private Map<String, String> tags;
+
+    /*
+     * Router Job events Labels
+     */
+    @Generated
+    private Map<String, String> 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<String, String> labels,
-        Map<String, String> tags) {
-        super(jobId, labels, tags);
+    private AcsRouterJobClassificationFailedEventData(String jobId) {
+        super(jobId);
     }
 
     /**
@@ -86,6 +95,28 @@ public List<ResponseError> getErrors() {
             .collect(Collectors.toList());
     }
 
+    /**
+     * Get the tags property: Router Jobs events Tags.
+     *
+     * @return the tags value.
+     */
+    @Generated
+    @Override
+    public Map<String, String> getTags() {
+        return this.tags;
+    }
+
+    /**
+     * Get the labels property: Router Job events Labels.
+     *
+     * @return the labels value.
+     */
+    @Generated
+    @Override
+    public Map<String, String> 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;