Skip to content

Commit 95d57ab

Browse files
rajeshkaCopilot
rajeshka
and
Copilot
authored
[EventGrid] Regenerate system events for May 2026 release (#49159)
* [EventGrid] Regenerate system events for May 2026 release Update system events to include changes from: - PR #42138: Adding new properties for ACSMessaging and IncomingCall events - PR #39046: Update Chat event to include sequenceId Updated tsp-location.yaml to point to latest azure-rest-api-specs commit 6ffd9e58a8c976b93c2d9d0db15a63907262d020 * Add VMSS Lifecycle Hook events (PR #40499) to system events Regenerated from azure-rest-api-specs commit 7089f3d2a4ed7e765d66f5f5e3be0b8b1eed6c1a which includes: - PR #42138: Adding new properties for ACSMessaging and IncomingCall events - PR #39046: Update Chat event to include sequenceId - PR #40499: Add VMSS Lifecycle Hook events to EG ST * Address Copilot review feedback on PR #49159 * Remove duplicate sequenceId field/getter override in 8 ACS chat subclasses; route deserialization through the package-private setSequenceId(Long) on the base classes so the inherited field is populated correctly. Files updated: - AcsChatMessageReceivedEventData.java - AcsChatMessageReceivedInThreadEventData.java - AcsChatTypingIndicatorReceivedInThreadEventData.java - AcsChatAzureBotCommandReceivedInThreadEventData.java - AcsChatMessageEditedEventData.java - AcsChatMessageEditedInThreadEventData.java - AcsChatMessageDeletedEventData.java - AcsChatMessageDeletedInThreadEventData.java * Add deserialization unit tests for the new fromBSUID / toBSUID fields on AcsMessageReceivedEventData and AcsMessageDeliveryStatusUpdatedEventData, plus matching test JSON fixtures under src/test/resources/testJsons/. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add cspell allowlist entries for new system events (bsuid, osscheduling, osrolling) The May 2026 system events regeneration introduced new identifiers from upstream TypeSpec that trip the cspell check in CI: * BSUID / Bsuid - ACS Messaging recipient/sender identifier used in AcsMessageDeliveryStatusUpdatedEventData and AcsMessageReceivedEventData * OSSCHEDULING - in VMSS lifecycle hook event UpgradeAutoOSScheduling * OSROLLING - in VMSS lifecycle hook event UpgradeAutoOSRollingBatchStarting These are legitimate identifiers from the generated models, not typos, so they belong on the sdk/eventgrid/** cspell allowlist. Verified locally with cspell - 0 issues across the 3 affected files. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Regenerate ACS Chat event models to match upstream TypeSpec The CI 'Verify Swagger and TypeSpec Code Generation' task failed because the previous Copilot review feedback commit (00c3604) hand-edited these 8 generated files to remove what looked like duplicate sequenceId fields. However the upstream TypeSpec (Microsoft.EventGrid.SystemEvents @ commit 7089f3d2 in azure-rest-api-specs) defines sequenceId on each of these concrete chat event types, so tsp-client emits a per-subclass field + @OverRide getter intentionally. Running 'tsp-client update' locally reproduces CI's diff exactly: 8 files, +136/-8 lines, adding back the @generated private Long sequenceId field, the @OverRide getSequenceId() accessor, and switching deserialization to write directly to this.sequenceId instead of setSequenceId(). The underlying 'duplicate field with the parent' concern Copilot raised is a TypeSpec authoring choice and is out of scope for this regen PR; it can be addressed in a follow-up against azure-rest-api-specs if needed. Affected files: - AcsChatAzureBotCommandReceivedInThreadEventData.java - AcsChatMessageDeletedEventData.java - AcsChatMessageDeletedInThreadEventData.java - AcsChatMessageEditedEventData.java - AcsChatMessageEditedInThreadEventData.java - AcsChatMessageReceivedEventData.java - AcsChatMessageReceivedInThreadEventData.java - AcsChatTypingIndicatorReceivedInThreadEventData.java Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: rajeshka <sa> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent c394ddf commit 95d57ab

38 files changed

Lines changed: 1727 additions & 7 deletions

File tree

‎.vscode/cspell.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,10 @@
16081608
"mqtt",
16091609
"rservice", // appears in the name SignalRService
16101610
"gcch",
1611-
"updation" // current typo in a swagger
1611+
"updation", // current typo in a swagger
1612+
"bsuid", // ACS Messaging recipient/sender identifier (BSUID / Bsuid)
1613+
"osscheduling", // VMSS lifecycle hook event: UpgradeAutoOSScheduling
1614+
"osrolling" // VMSS lifecycle hook event: UpgradeAutoOSRollingBatchStarting
16121615
]
16131616
},
16141617
{

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
import com.azure.messaging.eventgrid.systemevents.models.KeyVaultSecretExpiredEventData;
144144
import com.azure.messaging.eventgrid.systemevents.models.KeyVaultSecretNearExpiryEventData;
145145
import com.azure.messaging.eventgrid.systemevents.models.KeyVaultSecretNewVersionCreatedEventData;
146+
import com.azure.messaging.eventgrid.systemevents.models.LifecycleHookEventsEventData;
146147
import com.azure.messaging.eventgrid.systemevents.models.MachineLearningServicesDatasetDriftDetectedEventData;
147148
import com.azure.messaging.eventgrid.systemevents.models.MachineLearningServicesModelDeployedEventData;
148149
import com.azure.messaging.eventgrid.systemevents.models.MachineLearningServicesModelRegisteredEventData;
@@ -977,6 +978,12 @@ public final class SystemEventNames {
977978
*/
978979
public static final String KEY_VAULT_SECRET_NEW_VERSION_CREATED = "Microsoft.KeyVault.SecretNewVersionCreated";
979980

981+
/**
982+
* Schema of the Data property of an EventGridEvent for a
983+
* Microsoft.Compute.VirtualMachineScaleSets.LifecycleHookEvents preview event.
984+
*/
985+
public static final String LIFECYCLE_HOOK_EVENTS = "Microsoft.Compute.VirtualMachineScaleSets.LifecycleHookEvents";
986+
980987
/**
981988
* Schema of the Data property of an EventGridEvent for a Microsoft.MachineLearningServices.DatasetDriftDetected
982989
* event.
@@ -1513,6 +1520,7 @@ public final class SystemEventNames {
15131520
SYSTEM_EVENT_MAPPINGS.put(KEY_VAULT_SECRET_EXPIRED, KeyVaultSecretExpiredEventData.class);
15141521
SYSTEM_EVENT_MAPPINGS.put(KEY_VAULT_SECRET_NEAR_EXPIRY, KeyVaultSecretNearExpiryEventData.class);
15151522
SYSTEM_EVENT_MAPPINGS.put(KEY_VAULT_SECRET_NEW_VERSION_CREATED, KeyVaultSecretNewVersionCreatedEventData.class);
1523+
SYSTEM_EVENT_MAPPINGS.put(LIFECYCLE_HOOK_EVENTS, LifecycleHookEventsEventData.class);
15161524
SYSTEM_EVENT_MAPPINGS.put(MACHINE_LEARNING_SERVICES_DATASET_DRIFT_DETECTED,
15171525
MachineLearningServicesDatasetDriftDetectedEventData.class);
15181526
SYSTEM_EVENT_MAPPINGS.put(MACHINE_LEARNING_SERVICES_MODEL_DEPLOYED,

‎sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatAzureBotCommandReceivedInThreadEventData.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ public final class AcsChatAzureBotCommandReceivedInThreadEventData extends AcsCh
3333
@Generated
3434
private Map<String, String> metadata;
3535

36+
/*
37+
* The Sequence id of the message
38+
*/
39+
@Generated
40+
private Long sequenceId;
41+
3642
/*
3743
* The display name of the sender
3844
*/
@@ -84,6 +90,17 @@ public Map<String, String> getMetadata() {
8490
return this.metadata;
8591
}
8692

93+
/**
94+
* Get the sequenceId property: The Sequence id of the message.
95+
*
96+
* @return the sequenceId value.
97+
*/
98+
@Generated
99+
@Override
100+
public Long getSequenceId() {
101+
return this.sequenceId;
102+
}
103+
87104
/**
88105
* Get the senderDisplayName property: The display name of the sender.
89106
*
@@ -122,6 +139,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
122139
jsonWriter.writeLongField("version", getVersion());
123140
jsonWriter.writeStringField("transactionId", getTransactionId());
124141
jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName());
142+
jsonWriter.writeNumberField("sequenceId", getSequenceId());
125143
jsonWriter.writeStringField("messageBody", this.messageBody);
126144
return jsonWriter.writeEndObject();
127145
}
@@ -146,6 +164,7 @@ public static AcsChatAzureBotCommandReceivedInThreadEventData fromJson(JsonReade
146164
long version = 0L;
147165
String transactionId = null;
148166
String senderDisplayName = null;
167+
Long sequenceId = null;
149168
String messageBody = null;
150169
Map<String, String> metadata = null;
151170
while (reader.nextToken() != JsonToken.END_OBJECT) {
@@ -168,6 +187,8 @@ public static AcsChatAzureBotCommandReceivedInThreadEventData fromJson(JsonReade
168187
transactionId = reader.getString();
169188
} else if ("senderDisplayName".equals(fieldName)) {
170189
senderDisplayName = reader.getString();
190+
} else if ("sequenceId".equals(fieldName)) {
191+
sequenceId = reader.getNullable(JsonReader::getLong);
171192
} else if ("messageBody".equals(fieldName)) {
172193
messageBody = reader.getString();
173194
} else if ("metadata".equals(fieldName)) {
@@ -181,6 +202,7 @@ public static AcsChatAzureBotCommandReceivedInThreadEventData fromJson(JsonReade
181202
senderCommunicationIdentifier, composeTime, type, version, messageBody);
182203
deserializedAcsChatAzureBotCommandReceivedInThreadEventData.transactionId = transactionId;
183204
deserializedAcsChatAzureBotCommandReceivedInThreadEventData.senderDisplayName = senderDisplayName;
205+
deserializedAcsChatAzureBotCommandReceivedInThreadEventData.sequenceId = sequenceId;
184206
deserializedAcsChatAzureBotCommandReceivedInThreadEventData.metadata = metadata;
185207
return deserializedAcsChatAzureBotCommandReceivedInThreadEventData;
186208
});

‎sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageDeletedEventData.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ public final class AcsChatMessageDeletedEventData extends AcsChatMessageEventBas
2525
@Generated
2626
private final OffsetDateTime deleteTime;
2727

28+
/*
29+
* The Sequence id of the message
30+
*/
31+
@Generated
32+
private Long sequenceId;
33+
2834
/*
2935
* The display name of the sender
3036
*/
@@ -68,6 +74,17 @@ public OffsetDateTime getDeleteTime() {
6874
return this.deleteTime;
6975
}
7076

77+
/**
78+
* Get the sequenceId property: The Sequence id of the message.
79+
*
80+
* @return the sequenceId value.
81+
*/
82+
@Generated
83+
@Override
84+
public Long getSequenceId() {
85+
return this.sequenceId;
86+
}
87+
7188
/**
7289
* Get the senderDisplayName property: The display name of the sender.
7390
*
@@ -107,6 +124,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
107124
jsonWriter.writeLongField("version", getVersion());
108125
jsonWriter.writeStringField("transactionId", getTransactionId());
109126
jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName());
127+
jsonWriter.writeNumberField("sequenceId", getSequenceId());
110128
jsonWriter.writeStringField("deleteTime",
111129
this.deleteTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deleteTime));
112130
return jsonWriter.writeEndObject();
@@ -133,6 +151,7 @@ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) thr
133151
long version = 0L;
134152
String transactionId = null;
135153
String senderDisplayName = null;
154+
Long sequenceId = null;
136155
OffsetDateTime deleteTime = null;
137156
while (reader.nextToken() != JsonToken.END_OBJECT) {
138157
String fieldName = reader.getFieldName();
@@ -156,6 +175,8 @@ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) thr
156175
transactionId = reader.getString();
157176
} else if ("senderDisplayName".equals(fieldName)) {
158177
senderDisplayName = reader.getString();
178+
} else if ("sequenceId".equals(fieldName)) {
179+
sequenceId = reader.getNullable(JsonReader::getLong);
159180
} else if ("deleteTime".equals(fieldName)) {
160181
deleteTime = reader
161182
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
@@ -168,6 +189,7 @@ public static AcsChatMessageDeletedEventData fromJson(JsonReader jsonReader) thr
168189
senderCommunicationIdentifier, composeTime, type, version, deleteTime);
169190
deserializedAcsChatMessageDeletedEventData.transactionId = transactionId;
170191
deserializedAcsChatMessageDeletedEventData.senderDisplayName = senderDisplayName;
192+
deserializedAcsChatMessageDeletedEventData.sequenceId = sequenceId;
171193
return deserializedAcsChatMessageDeletedEventData;
172194
});
173195
}

‎sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageDeletedInThreadEventData.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ public final class AcsChatMessageDeletedInThreadEventData extends AcsChatMessage
2525
@Generated
2626
private final OffsetDateTime deleteTime;
2727

28+
/*
29+
* The Sequence id of the message
30+
*/
31+
@Generated
32+
private Long sequenceId;
33+
2834
/*
2935
* The display name of the sender
3036
*/
@@ -66,6 +72,17 @@ public OffsetDateTime getDeleteTime() {
6672
return this.deleteTime;
6773
}
6874

75+
/**
76+
* Get the sequenceId property: The Sequence id of the message.
77+
*
78+
* @return the sequenceId value.
79+
*/
80+
@Generated
81+
@Override
82+
public Long getSequenceId() {
83+
return this.sequenceId;
84+
}
85+
6986
/**
7087
* Get the senderDisplayName property: The display name of the sender.
7188
*
@@ -104,6 +121,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
104121
jsonWriter.writeLongField("version", getVersion());
105122
jsonWriter.writeStringField("transactionId", getTransactionId());
106123
jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName());
124+
jsonWriter.writeNumberField("sequenceId", getSequenceId());
107125
jsonWriter.writeStringField("deleteTime",
108126
this.deleteTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deleteTime));
109127
return jsonWriter.writeEndObject();
@@ -129,6 +147,7 @@ public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonRea
129147
long version = 0L;
130148
String transactionId = null;
131149
String senderDisplayName = null;
150+
Long sequenceId = null;
132151
OffsetDateTime deleteTime = null;
133152
while (reader.nextToken() != JsonToken.END_OBJECT) {
134153
String fieldName = reader.getFieldName();
@@ -150,6 +169,8 @@ public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonRea
150169
transactionId = reader.getString();
151170
} else if ("senderDisplayName".equals(fieldName)) {
152171
senderDisplayName = reader.getString();
172+
} else if ("sequenceId".equals(fieldName)) {
173+
sequenceId = reader.getNullable(JsonReader::getLong);
153174
} else if ("deleteTime".equals(fieldName)) {
154175
deleteTime = reader
155176
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
@@ -162,6 +183,7 @@ public static AcsChatMessageDeletedInThreadEventData fromJson(JsonReader jsonRea
162183
composeTime, type, version, deleteTime);
163184
deserializedAcsChatMessageDeletedInThreadEventData.transactionId = transactionId;
164185
deserializedAcsChatMessageDeletedInThreadEventData.senderDisplayName = senderDisplayName;
186+
deserializedAcsChatMessageDeletedInThreadEventData.sequenceId = sequenceId;
165187
return deserializedAcsChatMessageDeletedInThreadEventData;
166188
});
167189
}

‎sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedEventData.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ public final class AcsChatMessageEditedEventData extends AcsChatMessageEventBase
3838
@Generated
3939
private final OffsetDateTime editTime;
4040

41+
/*
42+
* The Sequence id of the message
43+
*/
44+
@Generated
45+
private Long sequenceId;
46+
4147
/*
4248
* The display name of the sender
4349
*/
@@ -103,6 +109,17 @@ public OffsetDateTime getEditTime() {
103109
return this.editTime;
104110
}
105111

112+
/**
113+
* Get the sequenceId property: The Sequence id of the message.
114+
*
115+
* @return the sequenceId value.
116+
*/
117+
@Generated
118+
@Override
119+
public Long getSequenceId() {
120+
return this.sequenceId;
121+
}
122+
106123
/**
107124
* Get the senderDisplayName property: The display name of the sender.
108125
*
@@ -142,6 +159,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
142159
jsonWriter.writeLongField("version", getVersion());
143160
jsonWriter.writeStringField("transactionId", getTransactionId());
144161
jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName());
162+
jsonWriter.writeNumberField("sequenceId", getSequenceId());
145163
jsonWriter.writeStringField("messageBody", this.messageBody);
146164
jsonWriter.writeStringField("editTime",
147165
this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime));
@@ -169,6 +187,7 @@ public static AcsChatMessageEditedEventData fromJson(JsonReader jsonReader) thro
169187
long version = 0L;
170188
String transactionId = null;
171189
String senderDisplayName = null;
190+
Long sequenceId = null;
172191
String messageBody = null;
173192
OffsetDateTime editTime = null;
174193
Map<String, String> metadata = null;
@@ -194,6 +213,8 @@ public static AcsChatMessageEditedEventData fromJson(JsonReader jsonReader) thro
194213
transactionId = reader.getString();
195214
} else if ("senderDisplayName".equals(fieldName)) {
196215
senderDisplayName = reader.getString();
216+
} else if ("sequenceId".equals(fieldName)) {
217+
sequenceId = reader.getNullable(JsonReader::getLong);
197218
} else if ("messageBody".equals(fieldName)) {
198219
messageBody = reader.getString();
199220
} else if ("editTime".equals(fieldName)) {
@@ -210,6 +231,7 @@ public static AcsChatMessageEditedEventData fromJson(JsonReader jsonReader) thro
210231
senderCommunicationIdentifier, composeTime, type, version, messageBody, editTime);
211232
deserializedAcsChatMessageEditedEventData.transactionId = transactionId;
212233
deserializedAcsChatMessageEditedEventData.senderDisplayName = senderDisplayName;
234+
deserializedAcsChatMessageEditedEventData.sequenceId = sequenceId;
213235
deserializedAcsChatMessageEditedEventData.metadata = metadata;
214236
return deserializedAcsChatMessageEditedEventData;
215237
});

‎sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatMessageEditedInThreadEventData.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ public final class AcsChatMessageEditedInThreadEventData extends AcsChatMessageE
3838
@Generated
3939
private final OffsetDateTime editTime;
4040

41+
/*
42+
* The Sequence id of the message
43+
*/
44+
@Generated
45+
private Long sequenceId;
46+
4147
/*
4248
* The display name of the sender
4349
*/
@@ -101,6 +107,17 @@ public OffsetDateTime getEditTime() {
101107
return this.editTime;
102108
}
103109

110+
/**
111+
* Get the sequenceId property: The Sequence id of the message.
112+
*
113+
* @return the sequenceId value.
114+
*/
115+
@Generated
116+
@Override
117+
public Long getSequenceId() {
118+
return this.sequenceId;
119+
}
120+
104121
/**
105122
* Get the senderDisplayName property: The display name of the sender.
106123
*
@@ -139,6 +156,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
139156
jsonWriter.writeLongField("version", getVersion());
140157
jsonWriter.writeStringField("transactionId", getTransactionId());
141158
jsonWriter.writeStringField("senderDisplayName", getSenderDisplayName());
159+
jsonWriter.writeNumberField("sequenceId", getSequenceId());
142160
jsonWriter.writeStringField("messageBody", this.messageBody);
143161
jsonWriter.writeStringField("editTime",
144162
this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime));
@@ -165,6 +183,7 @@ public static AcsChatMessageEditedInThreadEventData fromJson(JsonReader jsonRead
165183
long version = 0L;
166184
String transactionId = null;
167185
String senderDisplayName = null;
186+
Long sequenceId = null;
168187
String messageBody = null;
169188
OffsetDateTime editTime = null;
170189
Map<String, String> metadata = null;
@@ -188,6 +207,8 @@ public static AcsChatMessageEditedInThreadEventData fromJson(JsonReader jsonRead
188207
transactionId = reader.getString();
189208
} else if ("senderDisplayName".equals(fieldName)) {
190209
senderDisplayName = reader.getString();
210+
} else if ("sequenceId".equals(fieldName)) {
211+
sequenceId = reader.getNullable(JsonReader::getLong);
191212
} else if ("messageBody".equals(fieldName)) {
192213
messageBody = reader.getString();
193214
} else if ("editTime".equals(fieldName)) {
@@ -204,6 +225,7 @@ public static AcsChatMessageEditedInThreadEventData fromJson(JsonReader jsonRead
204225
composeTime, type, version, messageBody, editTime);
205226
deserializedAcsChatMessageEditedInThreadEventData.transactionId = transactionId;
206227
deserializedAcsChatMessageEditedInThreadEventData.senderDisplayName = senderDisplayName;
228+
deserializedAcsChatMessageEditedInThreadEventData.sequenceId = sequenceId;
207229
deserializedAcsChatMessageEditedInThreadEventData.metadata = metadata;
208230
return deserializedAcsChatMessageEditedInThreadEventData;
209231
});

0 commit comments

Comments
 (0)