CodeGen from PR 32520 in Azure/azure-rest-api-specs

Merge b0cd4c41c100c730a24b3fd93ad344836c1effce into b562f5020f499c2fab13f1454c1908123c33b8a2

Author: SDKAuto

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

@@ -30,22 +30,26 @@ public final class AcsSmsDeliveryAttemptProperties implements JsonSerializable<A
      * Number of segments that were successfully delivered
      */
     @Generated
-    private Integer segmentsSucceeded;
+    private final int segmentsSucceeded;
 
     /*
      * Number of segments whose delivery failed
      */
     @Generated
-    private Integer segmentsFailed;
+    private final int segmentsFailed;
 
     /**
      * Creates an instance of AcsSmsDeliveryAttemptProperties class.
      * 
      * @param timestamp the timestamp value to set.
+     * @param segmentsSucceeded the segmentsSucceeded value to set.
+     * @param segmentsFailed the segmentsFailed value to set.
      */
     @Generated
-    private AcsSmsDeliveryAttemptProperties(OffsetDateTime timestamp) {
+    private AcsSmsDeliveryAttemptProperties(OffsetDateTime timestamp, int segmentsSucceeded, int segmentsFailed) {
         this.timestamp = timestamp;
+        this.segmentsSucceeded = segmentsSucceeded;
+        this.segmentsFailed = segmentsFailed;
     }
 
     /**
@@ -64,7 +68,7 @@ public OffsetDateTime getTimestamp() {
      * @return the segmentsSucceeded value.
      */
     @Generated
-    public Integer getSegmentsSucceeded() {
+    public int getSegmentsSucceeded() {
         return this.segmentsSucceeded;
     }
 
@@ -74,7 +78,7 @@ public Integer getSegmentsSucceeded() {
      * @return the segmentsFailed value.
      */
     @Generated
-    public Integer getSegmentsFailed() {
+    public int getSegmentsFailed() {
         return this.segmentsFailed;
     }
 
@@ -87,8 +91,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("timestamp",
             this.timestamp == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.timestamp));
-        jsonWriter.writeNumberField("segmentsSucceeded", this.segmentsSucceeded);
-        jsonWriter.writeNumberField("segmentsFailed", this.segmentsFailed);
+        jsonWriter.writeIntField("segmentsSucceeded", this.segmentsSucceeded);
+        jsonWriter.writeIntField("segmentsFailed", this.segmentsFailed);
         return jsonWriter.writeEndObject();
     }
 
@@ -105,8 +109,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     public static AcsSmsDeliveryAttemptProperties fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
             OffsetDateTime timestamp = null;
-            Integer segmentsSucceeded = null;
-            Integer segmentsFailed = null;
+            int segmentsSucceeded = 0;
+            int segmentsFailed = 0;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
@@ -115,19 +119,14 @@ public static AcsSmsDeliveryAttemptProperties fromJson(JsonReader jsonReader) th
                     timestamp = reader
                         .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
                 } else if ("segmentsSucceeded".equals(fieldName)) {
-                    segmentsSucceeded = reader.getNullable(JsonReader::getInt);
+                    segmentsSucceeded = reader.getInt();
                 } else if ("segmentsFailed".equals(fieldName)) {
-                    segmentsFailed = reader.getNullable(JsonReader::getInt);
+                    segmentsFailed = reader.getInt();
                 } else {
                     reader.skipChildren();
                 }
             }
-            AcsSmsDeliveryAttemptProperties deserializedAcsSmsDeliveryAttemptProperties
-                = new AcsSmsDeliveryAttemptProperties(timestamp);
-            deserializedAcsSmsDeliveryAttemptProperties.segmentsSucceeded = segmentsSucceeded;
-            deserializedAcsSmsDeliveryAttemptProperties.segmentsFailed = segmentsFailed;
-
-            return deserializedAcsSmsDeliveryAttemptProperties;
+            return new AcsSmsDeliveryAttemptProperties(timestamp, segmentsSucceeded, segmentsFailed);
         });
     }
 }

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

@@ -24,13 +24,13 @@ public final class AcsSmsDeliveryReportReceivedEventData extends AcsSmsEventBase
      * Status of Delivery
      */
     @Generated
-    private String deliveryStatus;
+    private final String deliveryStatus;
 
     /*
      * Details about Delivery Status
      */
     @Generated
-    private String deliveryStatusDetails;
+    private final String deliveryStatusDetails;
 
     /*
      * List of details of delivery attempts made
@@ -50,33 +50,24 @@ public final class AcsSmsDeliveryReportReceivedEventData extends AcsSmsEventBase
     @Generated
     private String tag;
 
-    /*
-     * The identity of SMS message receiver
-     */
-    @Generated
-    private String to;
-
-    /*
-     * The identity of SMS message sender
-     */
-    @Generated
-    private String from;
-
-    /*
-     * The identity of the SMS message
-     */
-    @Generated
-    private String messageId;
-
     /**
      * Creates an instance of AcsSmsDeliveryReportReceivedEventData class.
      * 
+     * @param messageId the messageId value to set.
+     * @param from the from value to set.
+     * @param to the to value to set.
+     * @param deliveryStatus the deliveryStatus value to set.
+     * @param deliveryStatusDetails the deliveryStatusDetails value to set.
      * @param deliveryAttempts the deliveryAttempts value to set.
      * @param receivedTimestamp the receivedTimestamp value to set.
      */
     @Generated
-    private AcsSmsDeliveryReportReceivedEventData(List<AcsSmsDeliveryAttemptProperties> deliveryAttempts,
+    private AcsSmsDeliveryReportReceivedEventData(String messageId, String from, String to, String deliveryStatus,
+        String deliveryStatusDetails, List<AcsSmsDeliveryAttemptProperties> deliveryAttempts,
         OffsetDateTime receivedTimestamp) {
+        super(messageId, from, to);
+        this.deliveryStatus = deliveryStatus;
+        this.deliveryStatusDetails = deliveryStatusDetails;
         this.deliveryAttempts = deliveryAttempts;
         this.receivedTimestamp = receivedTimestamp;
     }
@@ -131,39 +122,6 @@ public String getTag() {
         return this.tag;
     }
 
-    /**
-     * Get the to property: The identity of SMS message receiver.
-     * 
-     * @return the to value.
-     */
-    @Generated
-    @Override
-    public String getTo() {
-        return this.to;
-    }
-
-    /**
-     * Get the from property: The identity of SMS message sender.
-     * 
-     * @return the from value.
-     */
-    @Generated
-    @Override
-    public String getFrom() {
-        return this.from;
-    }
-
-    /**
-     * Get the messageId property: The identity of the SMS message.
-     * 
-     * @return the messageId value.
-     */
-    @Generated
-    @Override
-    public String getMessageId() {
-        return this.messageId;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -174,14 +132,14 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("messageId", getMessageId());
         jsonWriter.writeStringField("from", getFrom());
         jsonWriter.writeStringField("to", getTo());
+        jsonWriter.writeStringField("deliveryStatus", this.deliveryStatus);
+        jsonWriter.writeStringField("deliveryStatusDetails", this.deliveryStatusDetails);
         jsonWriter.writeArrayField("deliveryAttempts", this.deliveryAttempts,
             (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("receivedTimestamp",
             this.receivedTimestamp == null
                 ? null
                 : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.receivedTimestamp));
-        jsonWriter.writeStringField("deliveryStatus", this.deliveryStatus);
-        jsonWriter.writeStringField("deliveryStatusDetails", this.deliveryStatusDetails);
         jsonWriter.writeStringField("tag", this.tag);
         return jsonWriter.writeEndObject();
     }
@@ -201,10 +159,10 @@ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonRead
             String messageId = null;
             String from = null;
             String to = null;
-            List<AcsSmsDeliveryAttemptProperties> deliveryAttempts = null;
-            OffsetDateTime receivedTimestamp = null;
             String deliveryStatus = null;
             String deliveryStatusDetails = null;
+            List<AcsSmsDeliveryAttemptProperties> deliveryAttempts = null;
+            OffsetDateTime receivedTimestamp = null;
             String tag = null;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
@@ -216,28 +174,24 @@ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonRead
                     from = reader.getString();
                 } else if ("to".equals(fieldName)) {
                     to = reader.getString();
+                } else if ("deliveryStatus".equals(fieldName)) {
+                    deliveryStatus = reader.getString();
+                } else if ("deliveryStatusDetails".equals(fieldName)) {
+                    deliveryStatusDetails = reader.getString();
                 } else if ("deliveryAttempts".equals(fieldName)) {
                     deliveryAttempts = reader.readArray(reader1 -> AcsSmsDeliveryAttemptProperties.fromJson(reader1));
                 } else if ("receivedTimestamp".equals(fieldName)) {
                     receivedTimestamp = reader
                         .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
-                } else if ("deliveryStatus".equals(fieldName)) {
-                    deliveryStatus = reader.getString();
-                } else if ("deliveryStatusDetails".equals(fieldName)) {
-                    deliveryStatusDetails = reader.getString();
                 } else if ("tag".equals(fieldName)) {
                     tag = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
             }
             AcsSmsDeliveryReportReceivedEventData deserializedAcsSmsDeliveryReportReceivedEventData
-                = new AcsSmsDeliveryReportReceivedEventData(deliveryAttempts, receivedTimestamp);
-            deserializedAcsSmsDeliveryReportReceivedEventData.messageId = messageId;
-            deserializedAcsSmsDeliveryReportReceivedEventData.from = from;
-            deserializedAcsSmsDeliveryReportReceivedEventData.to = to;
-            deserializedAcsSmsDeliveryReportReceivedEventData.deliveryStatus = deliveryStatus;
-            deserializedAcsSmsDeliveryReportReceivedEventData.deliveryStatusDetails = deliveryStatusDetails;
+                = new AcsSmsDeliveryReportReceivedEventData(messageId, from, to, deliveryStatus, deliveryStatusDetails,
+                    deliveryAttempts, receivedTimestamp);
             deserializedAcsSmsDeliveryReportReceivedEventData.tag = tag;
 
             return deserializedAcsSmsDeliveryReportReceivedEventData;

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

@@ -21,25 +21,32 @@ public class AcsSmsEventBaseProperties implements JsonSerializable<AcsSmsEventBa
      * The identity of the SMS message
      */
     @Generated
-    private String messageId;
+    private final String messageId;
 
     /*
      * The identity of SMS message sender
      */
     @Generated
-    private String from;
+    private final String from;
 
     /*
      * The identity of SMS message receiver
      */
     @Generated
-    private String to;
+    private final String to;
 
     /**
      * Creates an instance of AcsSmsEventBaseProperties class.
+     * 
+     * @param messageId the messageId value to set.
+     * @param from the from value to set.
+     * @param to the to value to set.
      */
     @Generated
-    protected AcsSmsEventBaseProperties() {
+    protected AcsSmsEventBaseProperties(String messageId, String from, String to) {
+        this.messageId = messageId;
+        this.from = from;
+        this.to = to;
     }
 
     /**
@@ -52,18 +59,6 @@ public String getMessageId() {
         return this.messageId;
     }
 
-    /**
-     * Set the messageId property: The identity of the SMS message.
-     * 
-     * @param messageId the messageId value to set.
-     * @return the AcsSmsEventBaseProperties object itself.
-     */
-    @Generated
-    AcsSmsEventBaseProperties setMessageId(String messageId) {
-        this.messageId = messageId;
-        return this;
-    }
-
     /**
      * Get the from property: The identity of SMS message sender.
      * 
@@ -74,18 +69,6 @@ public String getFrom() {
         return this.from;
     }
 
-    /**
-     * Set the from property: The identity of SMS message sender.
-     * 
-     * @param from the from value to set.
-     * @return the AcsSmsEventBaseProperties object itself.
-     */
-    @Generated
-    AcsSmsEventBaseProperties setFrom(String from) {
-        this.from = from;
-        return this;
-    }
-
     /**
      * Get the to property: The identity of SMS message receiver.
      * 
@@ -96,18 +79,6 @@ public String getTo() {
         return this.to;
     }
 
-    /**
-     * Set the to property: The identity of SMS message receiver.
-     * 
-     * @param to the to value to set.
-     * @return the AcsSmsEventBaseProperties object itself.
-     */
-    @Generated
-    AcsSmsEventBaseProperties setTo(String to) {
-        this.to = to;
-        return this;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -127,28 +98,30 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
      * @param jsonReader The JsonReader being read.
      * @return An instance of AcsSmsEventBaseProperties 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 AcsSmsEventBaseProperties.
      */
     @Generated
     public static AcsSmsEventBaseProperties fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            AcsSmsEventBaseProperties deserializedAcsSmsEventBaseProperties = new AcsSmsEventBaseProperties();
+            String messageId = null;
+            String from = null;
+            String to = null;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
                 if ("messageId".equals(fieldName)) {
-                    deserializedAcsSmsEventBaseProperties.messageId = reader.getString();
+                    messageId = reader.getString();
                 } else if ("from".equals(fieldName)) {
-                    deserializedAcsSmsEventBaseProperties.from = reader.getString();
+                    from = reader.getString();
                 } else if ("to".equals(fieldName)) {
-                    deserializedAcsSmsEventBaseProperties.to = reader.getString();
+                    to = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
             }
-
-            return deserializedAcsSmsEventBaseProperties;
+            return new AcsSmsEventBaseProperties(messageId, from, to);
         });
     }
 }