diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java index a9c3c97c35cd..96652ba901cb 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryAttemptProperties.java +++ b/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 { 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); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java index 9a4b103bcc1e..ffd2a948a8b4 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsDeliveryReportReceivedEventData.java +++ b/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 deliveryAttempts, + private AcsSmsDeliveryReportReceivedEventData(String messageId, String from, String to, String deliveryStatus, + String deliveryStatusDetails, List 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 deliveryAttempts = null; - OffsetDateTime receivedTimestamp = null; String deliveryStatus = null; String deliveryStatusDetails = null; + List deliveryAttempts = null; + OffsetDateTime receivedTimestamp = null; String tag = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); @@ -216,15 +174,15 @@ 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 { @@ -232,12 +190,8 @@ public static AcsSmsDeliveryReportReceivedEventData fromJson(JsonReader jsonRead } } 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; diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java index eadb6458fd8d..a7155713e10a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsEventBaseProperties.java +++ b/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 { - 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); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java index a9f228817d1c..39ee6f5b052e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java @@ -23,7 +23,7 @@ public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties { * The SMS content */ @Generated - private String message; + private final String message; /* * The time at which the SMS was received @@ -37,32 +37,21 @@ public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties { @Generated private final int segmentCount; - /* - * 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 AcsSmsReceivedEventData class. * + * @param messageId the messageId value to set. + * @param from the from value to set. + * @param to the to value to set. + * @param message the message value to set. * @param receivedTimestamp the receivedTimestamp value to set. * @param segmentCount the segmentCount value to set. */ @Generated - private AcsSmsReceivedEventData(OffsetDateTime receivedTimestamp, int segmentCount) { + private AcsSmsReceivedEventData(String messageId, String from, String to, String message, + OffsetDateTime receivedTimestamp, int segmentCount) { + super(messageId, from, to); + this.message = message; this.receivedTimestamp = receivedTimestamp; this.segmentCount = segmentCount; } @@ -97,39 +86,6 @@ public int getSegmentCount() { return this.segmentCount; } - /** - * 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} */ @@ -140,12 +96,12 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("messageId", getMessageId()); jsonWriter.writeStringField("from", getFrom()); jsonWriter.writeStringField("to", getTo()); + jsonWriter.writeStringField("message", this.message); jsonWriter.writeStringField("receivedTimestamp", this.receivedTimestamp == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.receivedTimestamp)); jsonWriter.writeIntField("segmentCount", this.segmentCount); - jsonWriter.writeStringField("message", this.message); return jsonWriter.writeEndObject(); } @@ -164,9 +120,9 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE String messageId = null; String from = null; String to = null; + String message = null; OffsetDateTime receivedTimestamp = null; int segmentCount = 0; - String message = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); @@ -177,25 +133,18 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE from = reader.getString(); } else if ("to".equals(fieldName)) { to = reader.getString(); + } else if ("message".equals(fieldName)) { + message = reader.getString(); } else if ("receivedTimestamp".equals(fieldName)) { receivedTimestamp = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else if ("segmentCount".equals(fieldName)) { segmentCount = reader.getInt(); - } else if ("message".equals(fieldName)) { - message = reader.getString(); } else { reader.skipChildren(); } } - AcsSmsReceivedEventData deserializedAcsSmsReceivedEventData - = new AcsSmsReceivedEventData(receivedTimestamp, segmentCount); - deserializedAcsSmsReceivedEventData.messageId = messageId; - deserializedAcsSmsReceivedEventData.from = from; - deserializedAcsSmsReceivedEventData.to = to; - deserializedAcsSmsReceivedEventData.message = message; - - return deserializedAcsSmsReceivedEventData; + return new AcsSmsReceivedEventData(messageId, from, to, message, receivedTimestamp, segmentCount); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueDeletedEventData.java index a28a4a4432da..f1fe3fc2cc6d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueDeletedEventData.java @@ -22,31 +22,40 @@ public final class AppConfigurationKeyValueDeletedEventData * The key used to identify the key-value that was deleted. */ @Generated - private String key; + private final String key; /* * The label, if any, used to identify the key-value that was deleted. */ @Generated - private String label; + private final String label; /* * The etag representing the key-value that was deleted. */ @Generated - private String etag; + private final String etag; /* * The sync token representing the server state after the event. */ @Generated - private String syncToken; + private final String syncToken; /** * Creates an instance of AppConfigurationKeyValueDeletedEventData class. + * + * @param key the key value to set. + * @param label the label value to set. + * @param etag the etag value to set. + * @param syncToken the syncToken value to set. */ @Generated - private AppConfigurationKeyValueDeletedEventData() { + private AppConfigurationKeyValueDeletedEventData(String key, String label, String etag, String syncToken) { + this.key = key; + this.label = label; + this.etag = etag; + this.syncToken = syncToken; } /** @@ -109,31 +118,33 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AppConfigurationKeyValueDeletedEventData 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 AppConfigurationKeyValueDeletedEventData. */ @Generated public static AppConfigurationKeyValueDeletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AppConfigurationKeyValueDeletedEventData deserializedAppConfigurationKeyValueDeletedEventData - = new AppConfigurationKeyValueDeletedEventData(); + String key = null; + String label = null; + String etag = null; + String syncToken = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("key".equals(fieldName)) { - deserializedAppConfigurationKeyValueDeletedEventData.key = reader.getString(); + key = reader.getString(); } else if ("label".equals(fieldName)) { - deserializedAppConfigurationKeyValueDeletedEventData.label = reader.getString(); + label = reader.getString(); } else if ("etag".equals(fieldName)) { - deserializedAppConfigurationKeyValueDeletedEventData.etag = reader.getString(); + etag = reader.getString(); } else if ("syncToken".equals(fieldName)) { - deserializedAppConfigurationKeyValueDeletedEventData.syncToken = reader.getString(); + syncToken = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedAppConfigurationKeyValueDeletedEventData; + return new AppConfigurationKeyValueDeletedEventData(key, label, etag, syncToken); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueModifiedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueModifiedEventData.java index c98f57ba8e95..3279a6f5870b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueModifiedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationKeyValueModifiedEventData.java @@ -22,31 +22,40 @@ public final class AppConfigurationKeyValueModifiedEventData * The key used to identify the key-value that was modified. */ @Generated - private String key; + private final String key; /* * The label, if any, used to identify the key-value that was modified. */ @Generated - private String label; + private final String label; /* * The etag representing the new state of the key-value. */ @Generated - private String etag; + private final String etag; /* * The sync token representing the server state after the event. */ @Generated - private String syncToken; + private final String syncToken; /** * Creates an instance of AppConfigurationKeyValueModifiedEventData class. + * + * @param key the key value to set. + * @param label the label value to set. + * @param etag the etag value to set. + * @param syncToken the syncToken value to set. */ @Generated - private AppConfigurationKeyValueModifiedEventData() { + private AppConfigurationKeyValueModifiedEventData(String key, String label, String etag, String syncToken) { + this.key = key; + this.label = label; + this.etag = etag; + this.syncToken = syncToken; } /** @@ -109,31 +118,33 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AppConfigurationKeyValueModifiedEventData 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 AppConfigurationKeyValueModifiedEventData. */ @Generated public static AppConfigurationKeyValueModifiedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AppConfigurationKeyValueModifiedEventData deserializedAppConfigurationKeyValueModifiedEventData - = new AppConfigurationKeyValueModifiedEventData(); + String key = null; + String label = null; + String etag = null; + String syncToken = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("key".equals(fieldName)) { - deserializedAppConfigurationKeyValueModifiedEventData.key = reader.getString(); + key = reader.getString(); } else if ("label".equals(fieldName)) { - deserializedAppConfigurationKeyValueModifiedEventData.label = reader.getString(); + label = reader.getString(); } else if ("etag".equals(fieldName)) { - deserializedAppConfigurationKeyValueModifiedEventData.etag = reader.getString(); + etag = reader.getString(); } else if ("syncToken".equals(fieldName)) { - deserializedAppConfigurationKeyValueModifiedEventData.syncToken = reader.getString(); + syncToken = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedAppConfigurationKeyValueModifiedEventData; + return new AppConfigurationKeyValueModifiedEventData(key, label, etag, syncToken); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotCreatedEventData.java index 4afe078de4b2..31d49bbaabe4 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotCreatedEventData.java @@ -16,62 +16,16 @@ */ @Immutable public final class AppConfigurationSnapshotCreatedEventData extends AppConfigurationSnapshotEventData { - /* - * The sync token representing the server state after the event. - */ - @Generated - private String syncToken; - - /* - * The etag representing the new state of the snapshot. - */ - @Generated - private String etag; - - /* - * The name of the snapshot. - */ - @Generated - private String name; - /** * Creates an instance of AppConfigurationSnapshotCreatedEventData class. - */ - @Generated - private AppConfigurationSnapshotCreatedEventData() { - } - - /** - * Get the syncToken property: The sync token representing the server state after the event. - * - * @return the syncToken value. - */ - @Generated - @Override - public String getSyncToken() { - return this.syncToken; - } - - /** - * Get the etag property: The etag representing the new state of the snapshot. * - * @return the etag value. + * @param name the name value to set. + * @param etag the etag value to set. + * @param syncToken the syncToken value to set. */ @Generated - @Override - public String getEtag() { - return this.etag; - } - - /** - * Get the name property: The name of the snapshot. - * - * @return the name value. - */ - @Generated - @Override - public String getName() { - return this.name; + private AppConfigurationSnapshotCreatedEventData(String name, String etag, String syncToken) { + super(name, etag, syncToken); } /** @@ -93,29 +47,30 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AppConfigurationSnapshotCreatedEventData 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 AppConfigurationSnapshotCreatedEventData. */ @Generated public static AppConfigurationSnapshotCreatedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AppConfigurationSnapshotCreatedEventData deserializedAppConfigurationSnapshotCreatedEventData - = new AppConfigurationSnapshotCreatedEventData(); + String name = null; + String etag = null; + String syncToken = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("name".equals(fieldName)) { - deserializedAppConfigurationSnapshotCreatedEventData.name = reader.getString(); + name = reader.getString(); } else if ("etag".equals(fieldName)) { - deserializedAppConfigurationSnapshotCreatedEventData.etag = reader.getString(); + etag = reader.getString(); } else if ("syncToken".equals(fieldName)) { - deserializedAppConfigurationSnapshotCreatedEventData.syncToken = reader.getString(); + syncToken = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedAppConfigurationSnapshotCreatedEventData; + return new AppConfigurationSnapshotCreatedEventData(name, etag, syncToken); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotEventData.java index 59067035f131..4b38de99004c 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotEventData.java @@ -21,25 +21,32 @@ public class AppConfigurationSnapshotEventData implements JsonSerializable { - AppConfigurationSnapshotEventData deserializedAppConfigurationSnapshotEventData - = new AppConfigurationSnapshotEventData(); + String name = null; + String etag = null; + String syncToken = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("name".equals(fieldName)) { - deserializedAppConfigurationSnapshotEventData.name = reader.getString(); + name = reader.getString(); } else if ("etag".equals(fieldName)) { - deserializedAppConfigurationSnapshotEventData.etag = reader.getString(); + etag = reader.getString(); } else if ("syncToken".equals(fieldName)) { - deserializedAppConfigurationSnapshotEventData.syncToken = reader.getString(); + syncToken = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedAppConfigurationSnapshotEventData; + return new AppConfigurationSnapshotEventData(name, etag, syncToken); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotModifiedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotModifiedEventData.java index 0218ea69896f..c977d6ceb71a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotModifiedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/AppConfigurationSnapshotModifiedEventData.java @@ -16,62 +16,16 @@ */ @Immutable public final class AppConfigurationSnapshotModifiedEventData extends AppConfigurationSnapshotEventData { - /* - * The sync token representing the server state after the event. - */ - @Generated - private String syncToken; - - /* - * The etag representing the new state of the snapshot. - */ - @Generated - private String etag; - - /* - * The name of the snapshot. - */ - @Generated - private String name; - /** * Creates an instance of AppConfigurationSnapshotModifiedEventData class. - */ - @Generated - private AppConfigurationSnapshotModifiedEventData() { - } - - /** - * Get the syncToken property: The sync token representing the server state after the event. - * - * @return the syncToken value. - */ - @Generated - @Override - public String getSyncToken() { - return this.syncToken; - } - - /** - * Get the etag property: The etag representing the new state of the snapshot. * - * @return the etag value. + * @param name the name value to set. + * @param etag the etag value to set. + * @param syncToken the syncToken value to set. */ @Generated - @Override - public String getEtag() { - return this.etag; - } - - /** - * Get the name property: The name of the snapshot. - * - * @return the name value. - */ - @Generated - @Override - public String getName() { - return this.name; + private AppConfigurationSnapshotModifiedEventData(String name, String etag, String syncToken) { + super(name, etag, syncToken); } /** @@ -93,29 +47,30 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of AppConfigurationSnapshotModifiedEventData 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 AppConfigurationSnapshotModifiedEventData. */ @Generated public static AppConfigurationSnapshotModifiedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - AppConfigurationSnapshotModifiedEventData deserializedAppConfigurationSnapshotModifiedEventData - = new AppConfigurationSnapshotModifiedEventData(); + String name = null; + String etag = null; + String syncToken = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("name".equals(fieldName)) { - deserializedAppConfigurationSnapshotModifiedEventData.name = reader.getString(); + name = reader.getString(); } else if ("etag".equals(fieldName)) { - deserializedAppConfigurationSnapshotModifiedEventData.etag = reader.getString(); + etag = reader.getString(); } else if ("syncToken".equals(fieldName)) { - deserializedAppConfigurationSnapshotModifiedEventData.syncToken = reader.getString(); + syncToken = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedAppConfigurationSnapshotModifiedEventData; + return new AppConfigurationSnapshotModifiedEventData(name, etag, syncToken); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndedEventData.java index 437e48a383f7..fc67cb5d3718 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndedEventData.java @@ -16,28 +16,14 @@ */ @Immutable public final class ContainerServiceClusterSupportEndedEventData extends ContainerServiceClusterSupportEventData { - /* - * The Kubernetes version of the ManagedCluster resource - */ - @Generated - private String kubernetesVersion; - /** * Creates an instance of ContainerServiceClusterSupportEndedEventData class. - */ - @Generated - private ContainerServiceClusterSupportEndedEventData() { - } - - /** - * Get the kubernetesVersion property: The Kubernetes version of the ManagedCluster resource. * - * @return the kubernetesVersion value. + * @param kubernetesVersion the kubernetesVersion value to set. */ @Generated - @Override - public String getKubernetesVersion() { - return this.kubernetesVersion; + private ContainerServiceClusterSupportEndedEventData(String kubernetesVersion) { + super(kubernetesVersion); } /** @@ -57,25 +43,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceClusterSupportEndedEventData 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 ContainerServiceClusterSupportEndedEventData. */ @Generated public static ContainerServiceClusterSupportEndedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceClusterSupportEndedEventData deserializedContainerServiceClusterSupportEndedEventData - = new ContainerServiceClusterSupportEndedEventData(); + String kubernetesVersion = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("kubernetesVersion".equals(fieldName)) { - deserializedContainerServiceClusterSupportEndedEventData.kubernetesVersion = reader.getString(); + kubernetesVersion = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceClusterSupportEndedEventData; + return new ContainerServiceClusterSupportEndedEventData(kubernetesVersion); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndingEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndingEventData.java index 8158e8238dbb..cd363774de90 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndingEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEndingEventData.java @@ -16,28 +16,14 @@ */ @Immutable public final class ContainerServiceClusterSupportEndingEventData extends ContainerServiceClusterSupportEventData { - /* - * The Kubernetes version of the ManagedCluster resource - */ - @Generated - private String kubernetesVersion; - /** * Creates an instance of ContainerServiceClusterSupportEndingEventData class. - */ - @Generated - private ContainerServiceClusterSupportEndingEventData() { - } - - /** - * Get the kubernetesVersion property: The Kubernetes version of the ManagedCluster resource. * - * @return the kubernetesVersion value. + * @param kubernetesVersion the kubernetesVersion value to set. */ @Generated - @Override - public String getKubernetesVersion() { - return this.kubernetesVersion; + private ContainerServiceClusterSupportEndingEventData(String kubernetesVersion) { + super(kubernetesVersion); } /** @@ -57,25 +43,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceClusterSupportEndingEventData 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 ContainerServiceClusterSupportEndingEventData. */ @Generated public static ContainerServiceClusterSupportEndingEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceClusterSupportEndingEventData deserializedContainerServiceClusterSupportEndingEventData - = new ContainerServiceClusterSupportEndingEventData(); + String kubernetesVersion = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("kubernetesVersion".equals(fieldName)) { - deserializedContainerServiceClusterSupportEndingEventData.kubernetesVersion = reader.getString(); + kubernetesVersion = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceClusterSupportEndingEventData; + return new ContainerServiceClusterSupportEndingEventData(kubernetesVersion); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEventData.java index a8780d6ac758..a7feb30e08b8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceClusterSupportEventData.java @@ -22,13 +22,16 @@ public class ContainerServiceClusterSupportEventData * The Kubernetes version of the ManagedCluster resource */ @Generated - private String kubernetesVersion; + private final String kubernetesVersion; /** * Creates an instance of ContainerServiceClusterSupportEventData class. + * + * @param kubernetesVersion the kubernetesVersion value to set. */ @Generated - protected ContainerServiceClusterSupportEventData() { + protected ContainerServiceClusterSupportEventData(String kubernetesVersion) { + this.kubernetesVersion = kubernetesVersion; } /** @@ -41,18 +44,6 @@ public String getKubernetesVersion() { return this.kubernetesVersion; } - /** - * Set the kubernetesVersion property: The Kubernetes version of the ManagedCluster resource. - * - * @param kubernetesVersion the kubernetesVersion value to set. - * @return the ContainerServiceClusterSupportEventData object itself. - */ - @Generated - ContainerServiceClusterSupportEventData setKubernetesVersion(String kubernetesVersion) { - this.kubernetesVersion = kubernetesVersion; - return this; - } - /** * {@inheritDoc} */ @@ -70,25 +61,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceClusterSupportEventData 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 ContainerServiceClusterSupportEventData. */ @Generated public static ContainerServiceClusterSupportEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceClusterSupportEventData deserializedContainerServiceClusterSupportEventData - = new ContainerServiceClusterSupportEventData(); + String kubernetesVersion = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("kubernetesVersion".equals(fieldName)) { - deserializedContainerServiceClusterSupportEventData.kubernetesVersion = reader.getString(); + kubernetesVersion = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceClusterSupportEventData; + return new ContainerServiceClusterSupportEventData(kubernetesVersion); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNewKubernetesVersionAvailableEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNewKubernetesVersionAvailableEventData.java index 51efdeda1ec5..4e8c467f970e 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNewKubernetesVersionAvailableEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNewKubernetesVersionAvailableEventData.java @@ -23,20 +23,20 @@ public final class ContainerServiceNewKubernetesVersionAvailableEventData * The highest PATCH Kubernetes version for the highest MINOR version supported by ManagedCluster resource */ @Generated - private String latestSupportedKubernetesVersion; + private final String latestSupportedKubernetesVersion; /* * The highest PATCH Kubernetes version for the MINOR version considered stable for the ManagedCluster resource */ @Generated - private String latestStableKubernetesVersion; + private final String latestStableKubernetesVersion; /* * The highest PATCH Kubernetes version for the lowest applicable MINOR version available for the ManagedCluster * resource */ @Generated - private String lowestMinorKubernetesVersion; + private final String lowestMinorKubernetesVersion; /* * The highest PATCH Kubernetes version considered preview for the ManagedCluster resource. There might not be any @@ -47,9 +47,17 @@ public final class ContainerServiceNewKubernetesVersionAvailableEventData /** * Creates an instance of ContainerServiceNewKubernetesVersionAvailableEventData class. + * + * @param latestSupportedKubernetesVersion the latestSupportedKubernetesVersion value to set. + * @param latestStableKubernetesVersion the latestStableKubernetesVersion value to set. + * @param lowestMinorKubernetesVersion the lowestMinorKubernetesVersion value to set. */ @Generated - private ContainerServiceNewKubernetesVersionAvailableEventData() { + private ContainerServiceNewKubernetesVersionAvailableEventData(String latestSupportedKubernetesVersion, + String latestStableKubernetesVersion, String lowestMinorKubernetesVersion) { + this.latestSupportedKubernetesVersion = latestSupportedKubernetesVersion; + this.latestStableKubernetesVersion = latestStableKubernetesVersion; + this.lowestMinorKubernetesVersion = lowestMinorKubernetesVersion; } /** @@ -116,34 +124,38 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceNewKubernetesVersionAvailableEventData 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 ContainerServiceNewKubernetesVersionAvailableEventData. */ @Generated public static ContainerServiceNewKubernetesVersionAvailableEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceNewKubernetesVersionAvailableEventData deserializedContainerServiceNewKubernetesVersionAvailableEventData - = new ContainerServiceNewKubernetesVersionAvailableEventData(); + String latestSupportedKubernetesVersion = null; + String latestStableKubernetesVersion = null; + String lowestMinorKubernetesVersion = null; + String latestPreviewKubernetesVersion = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("latestSupportedKubernetesVersion".equals(fieldName)) { - deserializedContainerServiceNewKubernetesVersionAvailableEventData.latestSupportedKubernetesVersion - = reader.getString(); + latestSupportedKubernetesVersion = reader.getString(); } else if ("latestStableKubernetesVersion".equals(fieldName)) { - deserializedContainerServiceNewKubernetesVersionAvailableEventData.latestStableKubernetesVersion - = reader.getString(); + latestStableKubernetesVersion = reader.getString(); } else if ("lowestMinorKubernetesVersion".equals(fieldName)) { - deserializedContainerServiceNewKubernetesVersionAvailableEventData.lowestMinorKubernetesVersion - = reader.getString(); + lowestMinorKubernetesVersion = reader.getString(); } else if ("latestPreviewKubernetesVersion".equals(fieldName)) { - deserializedContainerServiceNewKubernetesVersionAvailableEventData.latestPreviewKubernetesVersion - = reader.getString(); + latestPreviewKubernetesVersion = reader.getString(); } else { reader.skipChildren(); } } + ContainerServiceNewKubernetesVersionAvailableEventData deserializedContainerServiceNewKubernetesVersionAvailableEventData + = new ContainerServiceNewKubernetesVersionAvailableEventData(latestSupportedKubernetesVersion, + latestStableKubernetesVersion, lowestMinorKubernetesVersion); + deserializedContainerServiceNewKubernetesVersionAvailableEventData.latestPreviewKubernetesVersion + = latestPreviewKubernetesVersion; return deserializedContainerServiceNewKubernetesVersionAvailableEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingEventData.java index 10ff95349b85..7a084dd9db42 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingEventData.java @@ -22,13 +22,16 @@ public class ContainerServiceNodePoolRollingEventData * The name of the node pool in the ManagedCluster resource */ @Generated - private String nodePoolName; + private final String nodePoolName; /** * Creates an instance of ContainerServiceNodePoolRollingEventData class. + * + * @param nodePoolName the nodePoolName value to set. */ @Generated - protected ContainerServiceNodePoolRollingEventData() { + protected ContainerServiceNodePoolRollingEventData(String nodePoolName) { + this.nodePoolName = nodePoolName; } /** @@ -41,18 +44,6 @@ public String getNodePoolName() { return this.nodePoolName; } - /** - * Set the nodePoolName property: The name of the node pool in the ManagedCluster resource. - * - * @param nodePoolName the nodePoolName value to set. - * @return the ContainerServiceNodePoolRollingEventData object itself. - */ - @Generated - ContainerServiceNodePoolRollingEventData setNodePoolName(String nodePoolName) { - this.nodePoolName = nodePoolName; - return this; - } - /** * {@inheritDoc} */ @@ -70,25 +61,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceNodePoolRollingEventData 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 ContainerServiceNodePoolRollingEventData. */ @Generated public static ContainerServiceNodePoolRollingEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceNodePoolRollingEventData deserializedContainerServiceNodePoolRollingEventData - = new ContainerServiceNodePoolRollingEventData(); + String nodePoolName = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("nodePoolName".equals(fieldName)) { - deserializedContainerServiceNodePoolRollingEventData.nodePoolName = reader.getString(); + nodePoolName = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceNodePoolRollingEventData; + return new ContainerServiceNodePoolRollingEventData(nodePoolName); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingFailedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingFailedEventData.java index 54f016d57e85..dbac6d966864 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingFailedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingFailedEventData.java @@ -16,28 +16,14 @@ */ @Immutable public final class ContainerServiceNodePoolRollingFailedEventData extends ContainerServiceNodePoolRollingEventData { - /* - * The name of the node pool in the ManagedCluster resource - */ - @Generated - private String nodePoolName; - /** * Creates an instance of ContainerServiceNodePoolRollingFailedEventData class. - */ - @Generated - private ContainerServiceNodePoolRollingFailedEventData() { - } - - /** - * Get the nodePoolName property: The name of the node pool in the ManagedCluster resource. * - * @return the nodePoolName value. + * @param nodePoolName the nodePoolName value to set. */ @Generated - @Override - public String getNodePoolName() { - return this.nodePoolName; + private ContainerServiceNodePoolRollingFailedEventData(String nodePoolName) { + super(nodePoolName); } /** @@ -57,25 +43,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceNodePoolRollingFailedEventData 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 ContainerServiceNodePoolRollingFailedEventData. */ @Generated public static ContainerServiceNodePoolRollingFailedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceNodePoolRollingFailedEventData deserializedContainerServiceNodePoolRollingFailedEventData - = new ContainerServiceNodePoolRollingFailedEventData(); + String nodePoolName = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("nodePoolName".equals(fieldName)) { - deserializedContainerServiceNodePoolRollingFailedEventData.nodePoolName = reader.getString(); + nodePoolName = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceNodePoolRollingFailedEventData; + return new ContainerServiceNodePoolRollingFailedEventData(nodePoolName); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingStartedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingStartedEventData.java index adaea8393a2d..603ac3ef36d9 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingStartedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingStartedEventData.java @@ -16,28 +16,14 @@ */ @Immutable public final class ContainerServiceNodePoolRollingStartedEventData extends ContainerServiceNodePoolRollingEventData { - /* - * The name of the node pool in the ManagedCluster resource - */ - @Generated - private String nodePoolName; - /** * Creates an instance of ContainerServiceNodePoolRollingStartedEventData class. - */ - @Generated - private ContainerServiceNodePoolRollingStartedEventData() { - } - - /** - * Get the nodePoolName property: The name of the node pool in the ManagedCluster resource. * - * @return the nodePoolName value. + * @param nodePoolName the nodePoolName value to set. */ @Generated - @Override - public String getNodePoolName() { - return this.nodePoolName; + private ContainerServiceNodePoolRollingStartedEventData(String nodePoolName) { + super(nodePoolName); } /** @@ -57,25 +43,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceNodePoolRollingStartedEventData 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 ContainerServiceNodePoolRollingStartedEventData. */ @Generated public static ContainerServiceNodePoolRollingStartedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceNodePoolRollingStartedEventData deserializedContainerServiceNodePoolRollingStartedEventData - = new ContainerServiceNodePoolRollingStartedEventData(); + String nodePoolName = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("nodePoolName".equals(fieldName)) { - deserializedContainerServiceNodePoolRollingStartedEventData.nodePoolName = reader.getString(); + nodePoolName = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceNodePoolRollingStartedEventData; + return new ContainerServiceNodePoolRollingStartedEventData(nodePoolName); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingSucceededEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingSucceededEventData.java index 7a207bf2810d..7c266c07a32d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingSucceededEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/ContainerServiceNodePoolRollingSucceededEventData.java @@ -16,28 +16,14 @@ */ @Immutable public final class ContainerServiceNodePoolRollingSucceededEventData extends ContainerServiceNodePoolRollingEventData { - /* - * The name of the node pool in the ManagedCluster resource - */ - @Generated - private String nodePoolName; - /** * Creates an instance of ContainerServiceNodePoolRollingSucceededEventData class. - */ - @Generated - private ContainerServiceNodePoolRollingSucceededEventData() { - } - - /** - * Get the nodePoolName property: The name of the node pool in the ManagedCluster resource. * - * @return the nodePoolName value. + * @param nodePoolName the nodePoolName value to set. */ @Generated - @Override - public String getNodePoolName() { - return this.nodePoolName; + private ContainerServiceNodePoolRollingSucceededEventData(String nodePoolName) { + super(nodePoolName); } /** @@ -57,25 +43,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { * @param jsonReader The JsonReader being read. * @return An instance of ContainerServiceNodePoolRollingSucceededEventData 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 ContainerServiceNodePoolRollingSucceededEventData. */ @Generated public static ContainerServiceNodePoolRollingSucceededEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - ContainerServiceNodePoolRollingSucceededEventData deserializedContainerServiceNodePoolRollingSucceededEventData - = new ContainerServiceNodePoolRollingSucceededEventData(); + String nodePoolName = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("nodePoolName".equals(fieldName)) { - deserializedContainerServiceNodePoolRollingSucceededEventData.nodePoolName = reader.getString(); + nodePoolName = reader.getString(); } else { reader.skipChildren(); } } - - return deserializedContainerServiceNodePoolRollingSucceededEventData; + return new ContainerServiceNodePoolRollingSucceededEventData(nodePoolName); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EventHubCaptureFileCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EventHubCaptureFileCreatedEventData.java index 85e9a7ed0884..0d5c0f740c86 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EventHubCaptureFileCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/EventHubCaptureFileCreatedEventData.java @@ -25,43 +25,43 @@ public final class EventHubCaptureFileCreatedEventData * The path to the capture file. */ @Generated - private String fileUrl; + private final String fileUrl; /* * The file type of the capture file. */ @Generated - private String fileType; + private final String fileType; /* * The shard ID. */ @Generated - private String partitionId; + private final String partitionId; /* * The file size. */ @Generated - private Integer sizeInBytes; + private final int sizeInBytes; /* * The number of events in the file. */ @Generated - private Integer eventCount; + private final int eventCount; /* * The smallest sequence number from the queue. */ @Generated - private Integer firstSequenceNumber; + private final int firstSequenceNumber; /* * The last sequence number from the queue. */ @Generated - private Integer lastSequenceNumber; + private final int lastSequenceNumber; /* * The first time from the queue. @@ -78,11 +78,27 @@ public final class EventHubCaptureFileCreatedEventData /** * Creates an instance of EventHubCaptureFileCreatedEventData class. * + * @param fileUrl the fileUrl value to set. + * @param fileType the fileType value to set. + * @param partitionId the partitionId value to set. + * @param sizeInBytes the sizeInBytes value to set. + * @param eventCount the eventCount value to set. + * @param firstSequenceNumber the firstSequenceNumber value to set. + * @param lastSequenceNumber the lastSequenceNumber value to set. * @param firstEnqueueTime the firstEnqueueTime value to set. * @param lastEnqueueTime the lastEnqueueTime value to set. */ @Generated - private EventHubCaptureFileCreatedEventData(OffsetDateTime firstEnqueueTime, OffsetDateTime lastEnqueueTime) { + private EventHubCaptureFileCreatedEventData(String fileUrl, String fileType, String partitionId, int sizeInBytes, + int eventCount, int firstSequenceNumber, int lastSequenceNumber, OffsetDateTime firstEnqueueTime, + OffsetDateTime lastEnqueueTime) { + this.fileUrl = fileUrl; + this.fileType = fileType; + this.partitionId = partitionId; + this.sizeInBytes = sizeInBytes; + this.eventCount = eventCount; + this.firstSequenceNumber = firstSequenceNumber; + this.lastSequenceNumber = lastSequenceNumber; this.firstEnqueueTime = firstEnqueueTime; this.lastEnqueueTime = lastEnqueueTime; } @@ -123,7 +139,7 @@ public String getPartitionId() { * @return the sizeInBytes value. */ @Generated - public Integer getSizeInBytes() { + public int getSizeInBytes() { return this.sizeInBytes; } @@ -133,7 +149,7 @@ public Integer getSizeInBytes() { * @return the eventCount value. */ @Generated - public Integer getEventCount() { + public int getEventCount() { return this.eventCount; } @@ -143,7 +159,7 @@ public Integer getEventCount() { * @return the firstSequenceNumber value. */ @Generated - public Integer getFirstSequenceNumber() { + public int getFirstSequenceNumber() { return this.firstSequenceNumber; } @@ -153,7 +169,7 @@ public Integer getFirstSequenceNumber() { * @return the lastSequenceNumber value. */ @Generated - public Integer getLastSequenceNumber() { + public int getLastSequenceNumber() { return this.lastSequenceNumber; } @@ -184,19 +200,19 @@ public OffsetDateTime getLastEnqueueTime() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("fileUrl", this.fileUrl); + jsonWriter.writeStringField("fileType", this.fileType); + jsonWriter.writeStringField("partitionId", this.partitionId); + jsonWriter.writeIntField("sizeInBytes", this.sizeInBytes); + jsonWriter.writeIntField("eventCount", this.eventCount); + jsonWriter.writeIntField("firstSequenceNumber", this.firstSequenceNumber); + jsonWriter.writeIntField("lastSequenceNumber", this.lastSequenceNumber); jsonWriter.writeStringField("firstEnqueueTime", this.firstEnqueueTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.firstEnqueueTime)); jsonWriter.writeStringField("lastEnqueueTime", this.lastEnqueueTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.lastEnqueueTime)); - jsonWriter.writeStringField("fileUrl", this.fileUrl); - jsonWriter.writeStringField("fileType", this.fileType); - jsonWriter.writeStringField("partitionId", this.partitionId); - jsonWriter.writeNumberField("sizeInBytes", this.sizeInBytes); - jsonWriter.writeNumberField("eventCount", this.eventCount); - jsonWriter.writeNumberField("firstSequenceNumber", this.firstSequenceNumber); - jsonWriter.writeNumberField("lastSequenceNumber", this.lastSequenceNumber); return jsonWriter.writeEndObject(); } @@ -212,54 +228,45 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static EventHubCaptureFileCreatedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - OffsetDateTime firstEnqueueTime = null; - OffsetDateTime lastEnqueueTime = null; String fileUrl = null; String fileType = null; String partitionId = null; - Integer sizeInBytes = null; - Integer eventCount = null; - Integer firstSequenceNumber = null; - Integer lastSequenceNumber = null; + int sizeInBytes = 0; + int eventCount = 0; + int firstSequenceNumber = 0; + int lastSequenceNumber = 0; + OffsetDateTime firstEnqueueTime = null; + OffsetDateTime lastEnqueueTime = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("firstEnqueueTime".equals(fieldName)) { - firstEnqueueTime = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("lastEnqueueTime".equals(fieldName)) { - lastEnqueueTime = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("fileUrl".equals(fieldName)) { + if ("fileUrl".equals(fieldName)) { fileUrl = reader.getString(); } else if ("fileType".equals(fieldName)) { fileType = reader.getString(); } else if ("partitionId".equals(fieldName)) { partitionId = reader.getString(); } else if ("sizeInBytes".equals(fieldName)) { - sizeInBytes = reader.getNullable(JsonReader::getInt); + sizeInBytes = reader.getInt(); } else if ("eventCount".equals(fieldName)) { - eventCount = reader.getNullable(JsonReader::getInt); + eventCount = reader.getInt(); } else if ("firstSequenceNumber".equals(fieldName)) { - firstSequenceNumber = reader.getNullable(JsonReader::getInt); + firstSequenceNumber = reader.getInt(); } else if ("lastSequenceNumber".equals(fieldName)) { - lastSequenceNumber = reader.getNullable(JsonReader::getInt); + lastSequenceNumber = reader.getInt(); + } else if ("firstEnqueueTime".equals(fieldName)) { + firstEnqueueTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("lastEnqueueTime".equals(fieldName)) { + lastEnqueueTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else { reader.skipChildren(); } } - EventHubCaptureFileCreatedEventData deserializedEventHubCaptureFileCreatedEventData - = new EventHubCaptureFileCreatedEventData(firstEnqueueTime, lastEnqueueTime); - deserializedEventHubCaptureFileCreatedEventData.fileUrl = fileUrl; - deserializedEventHubCaptureFileCreatedEventData.fileType = fileType; - deserializedEventHubCaptureFileCreatedEventData.partitionId = partitionId; - deserializedEventHubCaptureFileCreatedEventData.sizeInBytes = sizeInBytes; - deserializedEventHubCaptureFileCreatedEventData.eventCount = eventCount; - deserializedEventHubCaptureFileCreatedEventData.firstSequenceNumber = firstSequenceNumber; - deserializedEventHubCaptureFileCreatedEventData.lastSequenceNumber = lastSequenceNumber; - - return deserializedEventHubCaptureFileCreatedEventData; + return new EventHubCaptureFileCreatedEventData(fileUrl, fileType, partitionId, sizeInBytes, eventCount, + firstSequenceNumber, lastSequenceNumber, firstEnqueueTime, lastEnqueueTime); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesDatasetDriftDetectedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesDatasetDriftDetectedEventData.java index 0ce920ef8121..9e2c9c841625 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesDatasetDriftDetectedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesDatasetDriftDetectedEventData.java @@ -25,37 +25,37 @@ public final class MachineLearningServicesDatasetDriftDetectedEventData * The ID of the data drift monitor that triggered the event. */ @Generated - private String dataDriftId; + private final String dataDriftId; /* * The name of the data drift monitor that triggered the event. */ @Generated - private String dataDriftName; + private final String dataDriftName; /* * The ID of the Run that detected data drift. */ @Generated - private String runId; + private final String runId; /* * The ID of the base Dataset used to detect drift. */ @Generated - private String baseDatasetId; + private final String baseDatasetId; /* * The ID of the target Dataset used to detect drift. */ @Generated - private String targetDatasetId; + private final String targetDatasetId; /* * The coefficient result that triggered the event. */ @Generated - private Double driftCoefficient; + private final double driftCoefficient; /* * The start time of the target dataset time series that resulted in drift detection. @@ -72,11 +72,25 @@ public final class MachineLearningServicesDatasetDriftDetectedEventData /** * Creates an instance of MachineLearningServicesDatasetDriftDetectedEventData class. * + * @param dataDriftId the dataDriftId value to set. + * @param dataDriftName the dataDriftName value to set. + * @param runId the runId value to set. + * @param baseDatasetId the baseDatasetId value to set. + * @param targetDatasetId the targetDatasetId value to set. + * @param driftCoefficient the driftCoefficient value to set. * @param startTime the startTime value to set. * @param endTime the endTime value to set. */ @Generated - private MachineLearningServicesDatasetDriftDetectedEventData(OffsetDateTime startTime, OffsetDateTime endTime) { + private MachineLearningServicesDatasetDriftDetectedEventData(String dataDriftId, String dataDriftName, String runId, + String baseDatasetId, String targetDatasetId, double driftCoefficient, OffsetDateTime startTime, + OffsetDateTime endTime) { + this.dataDriftId = dataDriftId; + this.dataDriftName = dataDriftName; + this.runId = runId; + this.baseDatasetId = baseDatasetId; + this.targetDatasetId = targetDatasetId; + this.driftCoefficient = driftCoefficient; this.startTime = startTime; this.endTime = endTime; } @@ -137,7 +151,7 @@ public String getTargetDatasetId() { * @return the driftCoefficient value. */ @Generated - public Double getDriftCoefficient() { + public double getDriftCoefficient() { return this.driftCoefficient; } @@ -168,16 +182,16 @@ public OffsetDateTime getEndTime() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("startTime", - this.startTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.startTime)); - jsonWriter.writeStringField("endTime", - this.endTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.endTime)); jsonWriter.writeStringField("dataDriftId", this.dataDriftId); jsonWriter.writeStringField("dataDriftName", this.dataDriftName); jsonWriter.writeStringField("runId", this.runId); jsonWriter.writeStringField("baseDatasetId", this.baseDatasetId); jsonWriter.writeStringField("targetDatasetId", this.targetDatasetId); - jsonWriter.writeNumberField("driftCoefficient", this.driftCoefficient); + jsonWriter.writeDoubleField("driftCoefficient", this.driftCoefficient); + jsonWriter.writeStringField("startTime", + this.startTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.startTime)); + jsonWriter.writeStringField("endTime", + this.endTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.endTime)); return jsonWriter.writeEndObject(); } @@ -194,25 +208,19 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { public static MachineLearningServicesDatasetDriftDetectedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - OffsetDateTime startTime = null; - OffsetDateTime endTime = null; String dataDriftId = null; String dataDriftName = null; String runId = null; String baseDatasetId = null; String targetDatasetId = null; - Double driftCoefficient = null; + double driftCoefficient = 0.0; + OffsetDateTime startTime = null; + OffsetDateTime endTime = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("startTime".equals(fieldName)) { - startTime = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("endTime".equals(fieldName)) { - endTime = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("dataDriftId".equals(fieldName)) { + if ("dataDriftId".equals(fieldName)) { dataDriftId = reader.getString(); } else if ("dataDriftName".equals(fieldName)) { dataDriftName = reader.getString(); @@ -223,21 +231,19 @@ public static MachineLearningServicesDatasetDriftDetectedEventData fromJson(Json } else if ("targetDatasetId".equals(fieldName)) { targetDatasetId = reader.getString(); } else if ("driftCoefficient".equals(fieldName)) { - driftCoefficient = reader.getNullable(JsonReader::getDouble); + driftCoefficient = reader.getDouble(); + } else if ("startTime".equals(fieldName)) { + startTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else if ("endTime".equals(fieldName)) { + endTime = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); } else { reader.skipChildren(); } } - MachineLearningServicesDatasetDriftDetectedEventData deserializedMachineLearningServicesDatasetDriftDetectedEventData - = new MachineLearningServicesDatasetDriftDetectedEventData(startTime, endTime); - deserializedMachineLearningServicesDatasetDriftDetectedEventData.dataDriftId = dataDriftId; - deserializedMachineLearningServicesDatasetDriftDetectedEventData.dataDriftName = dataDriftName; - deserializedMachineLearningServicesDatasetDriftDetectedEventData.runId = runId; - deserializedMachineLearningServicesDatasetDriftDetectedEventData.baseDatasetId = baseDatasetId; - deserializedMachineLearningServicesDatasetDriftDetectedEventData.targetDatasetId = targetDatasetId; - deserializedMachineLearningServicesDatasetDriftDetectedEventData.driftCoefficient = driftCoefficient; - - return deserializedMachineLearningServicesDatasetDriftDetectedEventData; + return new MachineLearningServicesDatasetDriftDetectedEventData(dataDriftId, dataDriftName, runId, + baseDatasetId, targetDatasetId, driftCoefficient, startTime, endTime); }); } } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelDeployedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelDeployedEventData.java index 9658156aea30..fb5f5e07e897 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelDeployedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelDeployedEventData.java @@ -24,43 +24,45 @@ public final class MachineLearningServicesModelDeployedEventData * The name of the deployed service. */ @Generated - private String serviceName; + private final String serviceName; /* * The compute type (e.g. ACI, AKS) of the deployed service. */ @Generated - private String serviceComputeType; + private final String serviceComputeType; /* * A common separated list of model IDs. The IDs of the models deployed in the service. */ @Generated - private String modelIds; + private final String modelIds; /* * The tags of the deployed service. */ @Generated - private final Map serviceTags; + private Map serviceTags; /* * The properties of the deployed service. */ @Generated - private final Map serviceProperties; + private Map serviceProperties; /** * Creates an instance of MachineLearningServicesModelDeployedEventData class. * - * @param serviceTags the serviceTags value to set. - * @param serviceProperties the serviceProperties value to set. + * @param serviceName the serviceName value to set. + * @param serviceComputeType the serviceComputeType value to set. + * @param modelIds the modelIds value to set. */ @Generated - private MachineLearningServicesModelDeployedEventData(Map serviceTags, - Map serviceProperties) { - this.serviceTags = serviceTags; - this.serviceProperties = serviceProperties; + private MachineLearningServicesModelDeployedEventData(String serviceName, String serviceComputeType, + String modelIds) { + this.serviceName = serviceName; + this.serviceComputeType = serviceComputeType; + this.modelIds = modelIds; } /** @@ -120,13 +122,13 @@ public Map getServiceProperties() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("serviceName", this.serviceName); + jsonWriter.writeStringField("serviceComputeType", this.serviceComputeType); + jsonWriter.writeStringField("modelIds", this.modelIds); jsonWriter.writeMapField("serviceTags", this.serviceTags, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); jsonWriter.writeMapField("serviceProperties", this.serviceProperties, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeStringField("serviceName", this.serviceName); - jsonWriter.writeStringField("serviceComputeType", this.serviceComputeType); - jsonWriter.writeStringField("modelIds", this.modelIds); return jsonWriter.writeEndObject(); } @@ -142,36 +144,35 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static MachineLearningServicesModelDeployedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map serviceTags = null; - Map serviceProperties = null; String serviceName = null; String serviceComputeType = null; String modelIds = null; + Map serviceTags = null; + Map serviceProperties = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("serviceTags".equals(fieldName)) { - serviceTags = reader.readMap(reader1 -> reader1 - .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("serviceProperties".equals(fieldName)) { - serviceProperties = reader.readMap(reader1 -> reader1 - .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("serviceName".equals(fieldName)) { + if ("serviceName".equals(fieldName)) { serviceName = reader.getString(); } else if ("serviceComputeType".equals(fieldName)) { serviceComputeType = reader.getString(); } else if ("modelIds".equals(fieldName)) { modelIds = reader.getString(); + } else if ("serviceTags".equals(fieldName)) { + serviceTags = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + } else if ("serviceProperties".equals(fieldName)) { + serviceProperties = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); } else { reader.skipChildren(); } } MachineLearningServicesModelDeployedEventData deserializedMachineLearningServicesModelDeployedEventData - = new MachineLearningServicesModelDeployedEventData(serviceTags, serviceProperties); - deserializedMachineLearningServicesModelDeployedEventData.serviceName = serviceName; - deserializedMachineLearningServicesModelDeployedEventData.serviceComputeType = serviceComputeType; - deserializedMachineLearningServicesModelDeployedEventData.modelIds = modelIds; + = new MachineLearningServicesModelDeployedEventData(serviceName, serviceComputeType, modelIds); + deserializedMachineLearningServicesModelDeployedEventData.serviceTags = serviceTags; + deserializedMachineLearningServicesModelDeployedEventData.serviceProperties = serviceProperties; return deserializedMachineLearningServicesModelDeployedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelRegisteredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelRegisteredEventData.java index 5d9564ea271b..cf80e567575b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelRegisteredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesModelRegisteredEventData.java @@ -24,37 +24,36 @@ public final class MachineLearningServicesModelRegisteredEventData * The name of the model that was registered. */ @Generated - private String modelName; + private final String modelName; /* * The version of the model that was registered. */ @Generated - private String modelVersion; + private final String modelVersion; /* * The tags of the model that was registered. */ @Generated - private final Map modelTags; + private Map modelTags; /* * The properties of the model that was registered. */ @Generated - private final Map modelProperties; + private Map modelProperties; /** * Creates an instance of MachineLearningServicesModelRegisteredEventData class. * - * @param modelTags the modelTags value to set. - * @param modelProperties the modelProperties value to set. + * @param modelName the modelName value to set. + * @param modelVersion the modelVersion value to set. */ @Generated - private MachineLearningServicesModelRegisteredEventData(Map modelTags, - Map modelProperties) { - this.modelTags = modelTags; - this.modelProperties = modelProperties; + private MachineLearningServicesModelRegisteredEventData(String modelName, String modelVersion) { + this.modelName = modelName; + this.modelVersion = modelVersion; } /** @@ -104,12 +103,12 @@ public Map getModelProperties() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + jsonWriter.writeStringField("modelName", this.modelName); + jsonWriter.writeStringField("modelVersion", this.modelVersion); jsonWriter.writeMapField("modelTags", this.modelTags, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); jsonWriter.writeMapField("modelProperties", this.modelProperties, (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeStringField("modelName", this.modelName); - jsonWriter.writeStringField("modelVersion", this.modelVersion); return jsonWriter.writeEndObject(); } @@ -125,32 +124,32 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static MachineLearningServicesModelRegisteredEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map modelTags = null; - Map modelProperties = null; String modelName = null; String modelVersion = null; + Map modelTags = null; + Map modelProperties = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("modelTags".equals(fieldName)) { + if ("modelName".equals(fieldName)) { + modelName = reader.getString(); + } else if ("modelVersion".equals(fieldName)) { + modelVersion = reader.getString(); + } else if ("modelTags".equals(fieldName)) { modelTags = reader.readMap(reader1 -> reader1 .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); } else if ("modelProperties".equals(fieldName)) { modelProperties = reader.readMap(reader1 -> reader1 .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("modelName".equals(fieldName)) { - modelName = reader.getString(); - } else if ("modelVersion".equals(fieldName)) { - modelVersion = reader.getString(); } else { reader.skipChildren(); } } MachineLearningServicesModelRegisteredEventData deserializedMachineLearningServicesModelRegisteredEventData - = new MachineLearningServicesModelRegisteredEventData(modelTags, modelProperties); - deserializedMachineLearningServicesModelRegisteredEventData.modelName = modelName; - deserializedMachineLearningServicesModelRegisteredEventData.modelVersion = modelVersion; + = new MachineLearningServicesModelRegisteredEventData(modelName, modelVersion); + deserializedMachineLearningServicesModelRegisteredEventData.modelTags = modelTags; + deserializedMachineLearningServicesModelRegisteredEventData.modelProperties = modelProperties; return deserializedMachineLearningServicesModelRegisteredEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunCompletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunCompletedEventData.java index be771e5a4c74..3c15710d83ee 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunCompletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunCompletedEventData.java @@ -24,49 +24,53 @@ public final class MachineLearningServicesRunCompletedEventData * The ID of the experiment that the run belongs to. */ @Generated - private String experimentId; + private final String experimentId; /* * The name of the experiment that the run belongs to. */ @Generated - private String experimentName; + private final String experimentName; /* * The ID of the Run that was completed. */ @Generated - private String runId; + private final String runId; /* * The Run Type of the completed Run. */ @Generated - private String runType; + private final String runType; /* * The tags of the completed Run. */ @Generated - private final Map runTags; + private Map runTags; /* * The properties of the completed Run. */ @Generated - private final Map runProperties; + private Map runProperties; /** * Creates an instance of MachineLearningServicesRunCompletedEventData class. * - * @param runTags the runTags value to set. - * @param runProperties the runProperties value to set. + * @param experimentId the experimentId value to set. + * @param experimentName the experimentName value to set. + * @param runId the runId value to set. + * @param runType the runType value to set. */ @Generated - private MachineLearningServicesRunCompletedEventData(Map runTags, - Map runProperties) { - this.runTags = runTags; - this.runProperties = runProperties; + private MachineLearningServicesRunCompletedEventData(String experimentId, String experimentName, String runId, + String runType) { + this.experimentId = experimentId; + this.experimentName = experimentName; + this.runId = runId; + this.runType = runType; } /** @@ -136,14 +140,14 @@ public Map getRunProperties() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("runTags", this.runTags, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("runProperties", this.runProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); jsonWriter.writeStringField("experimentId", this.experimentId); jsonWriter.writeStringField("experimentName", this.experimentName); jsonWriter.writeStringField("runId", this.runId); jsonWriter.writeStringField("runType", this.runType); + jsonWriter.writeMapField("runTags", this.runTags, + (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("runProperties", this.runProperties, + (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); return jsonWriter.writeEndObject(); } @@ -159,23 +163,17 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static MachineLearningServicesRunCompletedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map runTags = null; - Map runProperties = null; String experimentId = null; String experimentName = null; String runId = null; String runType = null; + Map runTags = null; + Map runProperties = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("runTags".equals(fieldName)) { - runTags = reader.readMap(reader1 -> reader1 - .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("runProperties".equals(fieldName)) { - runProperties = reader.readMap(reader1 -> reader1 - .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("experimentId".equals(fieldName)) { + if ("experimentId".equals(fieldName)) { experimentId = reader.getString(); } else if ("experimentName".equals(fieldName)) { experimentName = reader.getString(); @@ -183,16 +181,20 @@ public static MachineLearningServicesRunCompletedEventData fromJson(JsonReader j runId = reader.getString(); } else if ("runType".equals(fieldName)) { runType = reader.getString(); + } else if ("runTags".equals(fieldName)) { + runTags = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + } else if ("runProperties".equals(fieldName)) { + runProperties = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); } else { reader.skipChildren(); } } MachineLearningServicesRunCompletedEventData deserializedMachineLearningServicesRunCompletedEventData - = new MachineLearningServicesRunCompletedEventData(runTags, runProperties); - deserializedMachineLearningServicesRunCompletedEventData.experimentId = experimentId; - deserializedMachineLearningServicesRunCompletedEventData.experimentName = experimentName; - deserializedMachineLearningServicesRunCompletedEventData.runId = runId; - deserializedMachineLearningServicesRunCompletedEventData.runType = runType; + = new MachineLearningServicesRunCompletedEventData(experimentId, experimentName, runId, runType); + deserializedMachineLearningServicesRunCompletedEventData.runTags = runTags; + deserializedMachineLearningServicesRunCompletedEventData.runProperties = runProperties; return deserializedMachineLearningServicesRunCompletedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunStatusChangedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunStatusChangedEventData.java index f1c0f689b831..545d64945e68 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunStatusChangedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/MachineLearningServicesRunStatusChangedEventData.java @@ -24,55 +24,61 @@ public final class MachineLearningServicesRunStatusChangedEventData * The ID of the experiment that the Machine Learning Run belongs to. */ @Generated - private String experimentId; + private final String experimentId; /* * The name of the experiment that the Machine Learning Run belongs to. */ @Generated - private String experimentName; + private final String experimentName; /* * The ID of the Machine Learning Run. */ @Generated - private String runId; + private final String runId; /* * The Run Type of the Machine Learning Run. */ @Generated - private String runType; + private final String runType; /* * The tags of the Machine Learning Run. */ @Generated - private final Map runTags; + private Map runTags; /* * The properties of the Machine Learning Run. */ @Generated - private final Map runProperties; + private Map runProperties; /* * The status of the Machine Learning Run. */ @Generated - private String runStatus; + private final String runStatus; /** * Creates an instance of MachineLearningServicesRunStatusChangedEventData class. * - * @param runTags the runTags value to set. - * @param runProperties the runProperties value to set. - */ - @Generated - private MachineLearningServicesRunStatusChangedEventData(Map runTags, - Map runProperties) { - this.runTags = runTags; - this.runProperties = runProperties; + * @param experimentId the experimentId value to set. + * @param experimentName the experimentName value to set. + * @param runId the runId value to set. + * @param runType the runType value to set. + * @param runStatus the runStatus value to set. + */ + @Generated + private MachineLearningServicesRunStatusChangedEventData(String experimentId, String experimentName, String runId, + String runType, String runStatus) { + this.experimentId = experimentId; + this.experimentName = experimentName; + this.runId = runId; + this.runType = runType; + this.runStatus = runStatus; } /** @@ -152,15 +158,15 @@ public String getRunStatus() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("runTags", this.runTags, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("runProperties", this.runProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); jsonWriter.writeStringField("experimentId", this.experimentId); jsonWriter.writeStringField("experimentName", this.experimentName); jsonWriter.writeStringField("runId", this.runId); jsonWriter.writeStringField("runType", this.runType); jsonWriter.writeStringField("runStatus", this.runStatus); + jsonWriter.writeMapField("runTags", this.runTags, + (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("runProperties", this.runProperties, + (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); return jsonWriter.writeEndObject(); } @@ -176,24 +182,18 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static MachineLearningServicesRunStatusChangedEventData fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map runTags = null; - Map runProperties = null; String experimentId = null; String experimentName = null; String runId = null; String runType = null; String runStatus = null; + Map runTags = null; + Map runProperties = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("runTags".equals(fieldName)) { - runTags = reader.readMap(reader1 -> reader1 - .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("runProperties".equals(fieldName)) { - runProperties = reader.readMap(reader1 -> reader1 - .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); - } else if ("experimentId".equals(fieldName)) { + if ("experimentId".equals(fieldName)) { experimentId = reader.getString(); } else if ("experimentName".equals(fieldName)) { experimentName = reader.getString(); @@ -203,17 +203,21 @@ public static MachineLearningServicesRunStatusChangedEventData fromJson(JsonRead runType = reader.getString(); } else if ("runStatus".equals(fieldName)) { runStatus = reader.getString(); + } else if ("runTags".equals(fieldName)) { + runTags = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + } else if ("runProperties".equals(fieldName)) { + runProperties = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); } else { reader.skipChildren(); } } MachineLearningServicesRunStatusChangedEventData deserializedMachineLearningServicesRunStatusChangedEventData - = new MachineLearningServicesRunStatusChangedEventData(runTags, runProperties); - deserializedMachineLearningServicesRunStatusChangedEventData.experimentId = experimentId; - deserializedMachineLearningServicesRunStatusChangedEventData.experimentName = experimentName; - deserializedMachineLearningServicesRunStatusChangedEventData.runId = runId; - deserializedMachineLearningServicesRunStatusChangedEventData.runType = runType; - deserializedMachineLearningServicesRunStatusChangedEventData.runStatus = runStatus; + = new MachineLearningServicesRunStatusChangedEventData(experimentId, experimentName, runId, runType, + runStatus); + deserializedMachineLearningServicesRunStatusChangedEventData.runTags = runTags; + deserializedMachineLearningServicesRunStatusChangedEventData.runProperties = runProperties; return deserializedMachineLearningServicesRunStatusChangedEventData; }); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/tsp-location.yaml index 14b68a3edfbc..9b35def34fac 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: 8af03db33a90581edffb8a32fea562f36b7c61a8 +commit: 23e647123ea993e8800d6da4a89c65a203321ea9 repo: Azure/azure-rest-api-specs -additionalDirectories: +additionalDirectories: