Add new fields to ACS EG system events

sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java

@@ -30,6 +30,11 @@ public final class AcsEmailDeliveryReportReceivedEventData
      */
     private String recipient;
 
+    /*
+     * The Internet Message Id of the email been sent
+     */
+    private String internetMessageId;
+
     /*
      * The Id of the email been sent
      */
@@ -96,6 +101,26 @@ public AcsEmailDeliveryReportReceivedEventData setRecipient(String recipient) {
         return this;
     }
 
+    /**
+     * Get the internetMessageId property: The Internet Message Id of the email been sent.
+     * 
+     * @return the internetMessageId value.
+     */
+    public String getInternetMessageId() {
+        return this.internetMessageId;
+    }
+
+    /**
+     * Set the internetMessageId property: The Internet Message Id of the email been sent.
+     * 
+     * @param internetMessageId the internetMessageId value to set.
+     * @return the AcsEmailDeliveryReportReceivedEventData object itself.
+     */
+    public AcsEmailDeliveryReportReceivedEventData setInternetMessageId(String internetMessageId) {
+        this.internetMessageId = internetMessageId;
+        return this;
+    }
+
     /**
      * Get the messageId property: The Id of the email been sent.
      * 
@@ -186,6 +211,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("sender", this.sender);
         jsonWriter.writeStringField("recipient", this.recipient);
+        jsonWriter.writeStringField("internetMessageId", this.internetMessageId);
         jsonWriter.writeStringField("messageId", this.messageId);
         jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString());
         jsonWriter.writeJsonField("deliveryStatusDetails", this.deliveryStatusDetails);
@@ -216,6 +242,8 @@ public static AcsEmailDeliveryReportReceivedEventData fromJson(JsonReader jsonRe
                     deserializedAcsEmailDeliveryReportReceivedEventData.sender = reader.getString();
                 } else if ("recipient".equals(fieldName)) {
                     deserializedAcsEmailDeliveryReportReceivedEventData.recipient = reader.getString();
+                } else if ("internetMessageId".equals(fieldName)) {
+                    deserializedAcsEmailDeliveryReportReceivedEventData.internetMessageId = reader.getString();
                 } else if ("messageId".equals(fieldName)) {
                     deserializedAcsEmailDeliveryReportReceivedEventData.messageId = reader.getString();
                 } else if ("status".equals(fieldName)) {

sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportStatusDetails.java

@@ -17,6 +17,11 @@
 @Fluent
 public final class AcsEmailDeliveryReportStatusDetails
     implements JsonSerializable<AcsEmailDeliveryReportStatusDetails> {
+    /*
+     * Recipient Mail Server Host Name
+     */
+    private String recipientMailServerHostName;
+
     /*
      * Detailed status message
      */
@@ -28,6 +33,26 @@ public final class AcsEmailDeliveryReportStatusDetails
     public AcsEmailDeliveryReportStatusDetails() {
     }
 
+    /**
+     * Get the recipientMailServerHostName property: Recipient Mail Server Host Name.
+     * 
+     * @return the recipientMailServerHostName value.
+     */
+    public String getRecipientMailServerHostName() {
+        return this.recipientMailServerHostName;
+    }
+
+    /**
+     * Set the recipientMailServerHostName property: Recipient Mail Server Host Name.
+     * 
+     * @param recipientMailServerHostName the recipientMailServerHostName value to set.
+     * @return the AcsEmailDeliveryReportStatusDetails object itself.
+     */
+    public AcsEmailDeliveryReportStatusDetails setRecipientMailServerHostName(String recipientMailServerHostName) {
+        this.recipientMailServerHostName = recipientMailServerHostName;
+        return this;
+    }
+
     /**
      * Get the statusMessage property: Detailed status message.
      * 
@@ -54,6 +79,7 @@ public AcsEmailDeliveryReportStatusDetails setStatusMessage(String statusMessage
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("recipientMailServerHostName", this.recipientMailServerHostName);
         jsonWriter.writeStringField("statusMessage", this.statusMessage);
         return jsonWriter.writeEndObject();
     }
@@ -74,7 +100,9 @@ public static AcsEmailDeliveryReportStatusDetails fromJson(JsonReader jsonReader
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
-                if ("statusMessage".equals(fieldName)) {
+                if ("recipientMailServerHostName".equals(fieldName)) {
+                    deserializedAcsEmailDeliveryReportStatusDetails.recipientMailServerHostName = reader.getString();
+                } else if ("statusMessage".equals(fieldName)) {
                     deserializedAcsEmailDeliveryReportStatusDetails.statusMessage = reader.getString();
                 } else {
                     reader.skipChildren();

sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java

@@ -28,6 +28,11 @@ public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties {
      */
     private OffsetDateTime receivedTimestamp;
 
+    /*
+     * Number of segments in the message
+     */
+    private int segmentCount;
+
     /**
      * Creates an instance of AcsSmsReceivedEventData class.
      */
@@ -74,6 +79,26 @@ public AcsSmsReceivedEventData setReceivedTimestamp(OffsetDateTime receivedTimes
         return this;
     }
 
+    /**
+     * Get the segmentCount property: Number of segments in the message.
+     * 
+     * @return the segmentCount value.
+     */
+    public int getSegmentCount() {
+        return this.segmentCount;
+    }
+
+    /**
+     * Set the segmentCount property: Number of segments in the message.
+     * 
+     * @param segmentCount the segmentCount value to set.
+     * @return the AcsSmsReceivedEventData object itself.
+     */
+    public AcsSmsReceivedEventData setSegmentCount(int segmentCount) {
+        this.segmentCount = segmentCount;
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -110,6 +135,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("messageId", getMessageId());
         jsonWriter.writeStringField("from", getFrom());
         jsonWriter.writeStringField("to", getTo());
+        jsonWriter.writeIntField("segmentCount", this.segmentCount);
         jsonWriter.writeStringField("message", this.message);
         jsonWriter.writeStringField("receivedTimestamp",
             this.receivedTimestamp == null
@@ -124,6 +150,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
      * @param jsonReader The JsonReader being read.
      * @return An instance of AcsSmsReceivedEventData if the JsonReader was pointing to an instance of it, or null if it
      * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
      * @throws IOException If an error occurs while reading the AcsSmsReceivedEventData.
      */
     public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOException {
@@ -139,6 +166,8 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE
                     deserializedAcsSmsReceivedEventData.setFrom(reader.getString());
                 } else if ("to".equals(fieldName)) {
                     deserializedAcsSmsReceivedEventData.setTo(reader.getString());
+                } else if ("segmentCount".equals(fieldName)) {
+                    deserializedAcsSmsReceivedEventData.segmentCount = reader.getInt();
                 } else if ("message".equals(fieldName)) {
                     deserializedAcsSmsReceivedEventData.message = reader.getString();
                 } else if ("receivedTimestamp".equals(fieldName)) {

sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md

@@ -86,34 +86,34 @@ custom-types: CloudEvent,EventGridEvent,AcsRouterCommunicationError,AcsMessageCh
 
 
 input-file:
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/fb64eaa0dfc7ee8abc8e10369495729d5b3c1cc5/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/ContainerServiceEventResources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/ContainerServiceEventResources.json
 
 ```