Add new properties on AcsMessageReceivedEventData (Azure#44124)

Author: samvaity

sdk/eventgrid/azure-messaging-eventgrid-systemevents/customization/src/main/java/EventGridSystemEventsCustomization.java

@@ -63,7 +63,7 @@ public void customize(LibraryCustomization customization, Logger logger) {
         customizeAcsRouterEvents(customization, logger);
         customizeAcsRecordingFileStatusUpdatedEventDataDuration(customization, logger);
         customizeStorageDirectoryDeletedEventData(customization, logger);
-        customizeAcsMessageEventData(customization, logger);
+        customizeAcsMessageEventDataAndInheritingClasses(customization, logger);
         generateSystemEventNames(customization, logger);
     }
 
@@ -232,20 +232,27 @@ public void customizeStorageDirectoryDeletedEventData(LibraryCustomization custo
         classCustomization.getMethod("getRecursive").rename("isRecursive").setReturnType("Boolean", "Boolean.getBoolean(%s)");
     }
 
-    public void customizeAcsMessageEventData(LibraryCustomization customization, Logger logger) {
+    public void customizeAcsMessageEventDataAndInheritingClasses(LibraryCustomization customization, Logger logger) {
         PackageCustomization packageModels = customization.getPackage("com.azure.messaging.eventgrid.systemevents");
-        ClassCustomization classCustomization = packageModels.getClass("AcsMessageEventData");
-        classCustomization.addImports("com.azure.core.models.ResponseError");
-        classCustomization.customizeAst(comp -> {
-            ClassOrInterfaceDeclaration clazz = comp.getClassByName("AcsMessageEventData").get();
-            // Fix up the getError method to always return a ResponseError.
-            clazz.getMethodsByName("getError").forEach(m -> {
-                m.setType("ResponseError")
-                    .setBody(parseBlock("{ return new ResponseError(this.error.getChannelCode(), this.error.getChannelMessage()); }"))
-                    .setJavadocComment(new Javadoc(new JavadocDescription(List.of(new JavadocSnippet("Get the error property: The channel error code and message."))))
-                        .addBlockTag("return", "the error value."));
+        List<String> classNames = Arrays.asList(
+            "AcsMessageEventData",
+            "AcsMessageDeliveryStatusUpdatedEventData",
+            "AcsMessageReceivedEventData"
+        );
+        for (String className : classNames) {
+            ClassCustomization classCustomization = packageModels.getClass(className);
+            classCustomization.addImports("com.azure.core.models.ResponseError");
+            classCustomization.customizeAst(comp -> {
+                ClassOrInterfaceDeclaration clazz = comp.getClassByName(className).get();
+                // Fix up the getError method to always return a ResponseError.
+                clazz.getMethodsByName("getError").forEach(m -> {
+                    m.setType("ResponseError")
+                        .setBody(parseBlock("{ return new ResponseError(this.error.getChannelCode(), this.error.getChannelMessage()); }"))
+                        .setJavadocComment(new Javadoc(new JavadocDescription(List.of(new JavadocSnippet("Get the error property: The channel error code and message."))))
+                            .addBlockTag("return", "the error value."));
+                });
             });
-        });
+        }
     }
 
     public static String getConstantName(String name) {

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

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
-
 package com.azure.messaging.eventgrid.systemevents;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.Immutable;
+import com.azure.core.models.ResponseError;
 import com.azure.core.util.CoreUtils;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
@@ -21,6 +21,7 @@
  */
 @Immutable
 public final class AcsMessageDeliveryStatusUpdatedEventData extends AcsMessageEventData {
+
     /*
      * The message id
      */
@@ -40,36 +41,31 @@ public final class AcsMessageDeliveryStatusUpdatedEventData extends AcsMessageEv
     private final AcsMessageChannelKind channelKind;
 
     /*
-     * The message recipient
+     * The channel event error
      */
     @Generated
-    private String to;
-
-    /*
-     * The message sender
-     */
-    @Generated
-    private String from;
+    private AcsMessageChannelEventError error;
 
     /**
      * Creates an instance of AcsMessageDeliveryStatusUpdatedEventData class.
-     * 
+     *
+     * @param from the from value to set.
+     * @param to the to value to set.
      * @param receivedTimestamp the receivedTimestamp value to set.
-     * @param error the error value to set.
      * @param status the status value to set.
      * @param channelKind the channelKind value to set.
      */
     @Generated
-    private AcsMessageDeliveryStatusUpdatedEventData(OffsetDateTime receivedTimestamp,
-        AcsMessageChannelEventError error, AcsMessageDeliveryStatus status, AcsMessageChannelKind channelKind) {
-        super(receivedTimestamp, error);
+    private AcsMessageDeliveryStatusUpdatedEventData(String from, String to, OffsetDateTime receivedTimestamp,
+        AcsMessageDeliveryStatus status, AcsMessageChannelKind channelKind) {
+        super(from, to, receivedTimestamp);
         this.status = status;
         this.channelKind = channelKind;
     }
 
     /**
      * Get the messageId property: The message id.
-     * 
+     *
      * @return the messageId value.
      */
     @Generated
@@ -79,7 +75,7 @@ public String getMessageId() {
 
     /**
      * Get the status property: The updated message status.
-     * 
+     *
      * @return the status value.
      */
     @Generated
@@ -89,7 +85,7 @@ public AcsMessageDeliveryStatus getStatus() {
 
     /**
      * Get the channelKind property: The updated message channel type.
-     * 
+     *
      * @return the channelKind value.
      */
     @Generated
@@ -98,25 +94,14 @@ public AcsMessageChannelKind getChannelKind() {
     }
 
     /**
-     * Get the to property: The message recipient.
-     * 
-     * @return the to value.
-     */
-    @Generated
-    @Override
-    public String getTo() {
-        return this.to;
-    }
-
-    /**
-     * Get the from property: The message sender.
-     * 
-     * @return the from value.
+     * Get the error property: The channel error code and message.
+     *
+     * @return the error value.
      */
     @Generated
     @Override
-    public String getFrom() {
-        return this.from;
+    public ResponseError getError() {
+        return new ResponseError(this.error.getChannelCode(), this.error.getChannelMessage());
     }
 
     /**
@@ -126,13 +111,13 @@ public String getFrom() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("from", getFrom());
+        jsonWriter.writeStringField("to", getTo());
         jsonWriter.writeStringField("receivedTimeStamp",
             getReceivedTimestamp() == null
                 ? null
                 : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getReceivedTimestamp()));
         jsonWriter.writeJsonField("error", getError());
-        jsonWriter.writeStringField("from", getFrom());
-        jsonWriter.writeStringField("to", getTo());
         jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString());
         jsonWriter.writeStringField("channelType", this.channelKind == null ? null : this.channelKind.toString());
         jsonWriter.writeStringField("messageId", this.messageId);
@@ -141,7 +126,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
 
     /**
      * Reads an instance of AcsMessageDeliveryStatusUpdatedEventData from the JsonReader.
-     * 
+     *
      * @param jsonReader The JsonReader being read.
      * @return An instance of AcsMessageDeliveryStatusUpdatedEventData if the JsonReader was pointing to an instance of
      * it, or null if it was pointing to JSON null.
@@ -151,26 +136,25 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     @Generated
     public static AcsMessageDeliveryStatusUpdatedEventData fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            OffsetDateTime receivedTimestamp = null;
-            AcsMessageChannelEventError error = null;
             String from = null;
             String to = null;
+            OffsetDateTime receivedTimestamp = null;
+            AcsMessageChannelEventError error = null;
             AcsMessageDeliveryStatus status = null;
             AcsMessageChannelKind channelKind = null;
             String messageId = null;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-
-                if ("receivedTimeStamp".equals(fieldName)) {
+                if ("from".equals(fieldName)) {
+                    from = reader.getString();
+                } else if ("to".equals(fieldName)) {
+                    to = reader.getString();
+                } else if ("receivedTimeStamp".equals(fieldName)) {
                     receivedTimestamp = reader
                         .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
                 } else if ("error".equals(fieldName)) {
                     error = AcsMessageChannelEventError.fromJson(reader);
-                } else if ("from".equals(fieldName)) {
-                    from = reader.getString();
-                } else if ("to".equals(fieldName)) {
-                    to = reader.getString();
                 } else if ("status".equals(fieldName)) {
                     status = AcsMessageDeliveryStatus.fromString(reader.getString());
                 } else if ("channelType".equals(fieldName)) {
@@ -182,11 +166,9 @@ public static AcsMessageDeliveryStatusUpdatedEventData fromJson(JsonReader jsonR
                 }
             }
             AcsMessageDeliveryStatusUpdatedEventData deserializedAcsMessageDeliveryStatusUpdatedEventData
-                = new AcsMessageDeliveryStatusUpdatedEventData(receivedTimestamp, error, status, channelKind);
-            deserializedAcsMessageDeliveryStatusUpdatedEventData.from = from;
-            deserializedAcsMessageDeliveryStatusUpdatedEventData.to = to;
+                = new AcsMessageDeliveryStatusUpdatedEventData(from, to, receivedTimestamp, status, channelKind);
+            deserializedAcsMessageDeliveryStatusUpdatedEventData.error = error;
             deserializedAcsMessageDeliveryStatusUpdatedEventData.messageId = messageId;
-
             return deserializedAcsMessageDeliveryStatusUpdatedEventData;
         });
     }

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

@@ -26,13 +26,13 @@ public class AcsMessageEventData implements JsonSerializable<AcsMessageEventData
      * The message sender
      */
     @Generated
-    private String from;
+    private final String from;
 
     /*
      * The message recipient
      */
     @Generated
-    private String to;
+    private final String to;
 
     /*
      * The time message was received
@@ -44,18 +44,20 @@ public class AcsMessageEventData implements JsonSerializable<AcsMessageEventData
      * The channel event error
      */
     @Generated
-    private final AcsMessageChannelEventError error;
+    private AcsMessageChannelEventError error;
 
     /**
      * Creates an instance of AcsMessageEventData class.
      *
+     * @param from the from value to set.
+     * @param to the to value to set.
      * @param receivedTimestamp the receivedTimestamp value to set.
-     * @param error the error value to set.
      */
     @Generated
-    protected AcsMessageEventData(OffsetDateTime receivedTimestamp, AcsMessageChannelEventError error) {
+    protected AcsMessageEventData(String from, String to, OffsetDateTime receivedTimestamp) {
+        this.from = from;
+        this.to = to;
         this.receivedTimestamp = receivedTimestamp;
-        this.error = error;
     }
 
     /**
@@ -68,18 +70,6 @@ public String getFrom() {
         return this.from;
     }
 
-    /**
-     * Set the from property: The message sender.
-     *
-     * @param from the from value to set.
-     * @return the AcsMessageEventData object itself.
-     */
-    @Generated
-    AcsMessageEventData setFrom(String from) {
-        this.from = from;
-        return this;
-    }
-
     /**
      * Get the to property: The message recipient.
      *
@@ -90,18 +80,6 @@ public String getTo() {
         return this.to;
     }
 
-    /**
-     * Set the to property: The message recipient.
-     *
-     * @param to the to value to set.
-     * @return the AcsMessageEventData object itself.
-     */
-    @Generated
-    AcsMessageEventData setTo(String to) {
-        this.to = to;
-        return this;
-    }
-
     /**
      * Get the receivedTimestamp property: The time message was received.
      *
@@ -122,20 +100,32 @@ public ResponseError getError() {
         return new ResponseError(this.error.getChannelCode(), this.error.getChannelMessage());
     }
 
+    /**
+     * Set the error property: The channel event error.
+     *
+     * @param error the error value to set.
+     * @return the AcsMessageEventData object itself.
+     */
+    @Generated
+    AcsMessageEventData setError(AcsMessageChannelEventError error) {
+        this.error = error;
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
     @Generated
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("from", this.from);
+        jsonWriter.writeStringField("to", this.to);
         jsonWriter.writeStringField("receivedTimeStamp",
             this.receivedTimestamp == null
                 ? null
                 : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.receivedTimestamp));
         jsonWriter.writeJsonField("error", this.error);
-        jsonWriter.writeStringField("from", this.from);
-        jsonWriter.writeStringField("to", this.to);
         return jsonWriter.writeEndObject();
     }
 
@@ -151,29 +141,28 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     @Generated
     public static AcsMessageEventData fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            OffsetDateTime receivedTimestamp = null;
-            AcsMessageChannelEventError error = null;
             String from = null;
             String to = null;
+            OffsetDateTime receivedTimestamp = null;
+            AcsMessageChannelEventError error = null;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("receivedTimeStamp".equals(fieldName)) {
+                if ("from".equals(fieldName)) {
+                    from = reader.getString();
+                } else if ("to".equals(fieldName)) {
+                    to = reader.getString();
+                } else if ("receivedTimeStamp".equals(fieldName)) {
                     receivedTimestamp = reader
                         .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
                 } else if ("error".equals(fieldName)) {
                     error = AcsMessageChannelEventError.fromJson(reader);
-                } else if ("from".equals(fieldName)) {
-                    from = reader.getString();
-                } else if ("to".equals(fieldName)) {
-                    to = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
             }
-            AcsMessageEventData deserializedAcsMessageEventData = new AcsMessageEventData(receivedTimestamp, error);
-            deserializedAcsMessageEventData.from = from;
-            deserializedAcsMessageEventData.to = to;
+            AcsMessageEventData deserializedAcsMessageEventData = new AcsMessageEventData(from, to, receivedTimestamp);
+            deserializedAcsMessageEventData.error = error;
             return deserializedAcsMessageEventData;
         });
     }