diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs
index 64f0794061dfa..d7e84134d0b43 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs
@@ -1860,15 +1860,37 @@ public static ApiManagementApiReleaseDeletedEventData ApiManagementApiReleaseDel
return new ApiManagementApiReleaseDeletedEventData(resourceUri);
}
- /// Initializes a new instance of HealthcareFhirResourceEventBaseProperties.
- /// Type of HL7 FHIR resource.
- /// Domain name of FHIR account for this resource.
- /// Id of HL7 FHIR resource.
- /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
- /// A new instance for mocking.
- public static HealthcareFhirResourceEventBaseProperties HealthcareFhirResourceEventBaseProperties(HealthcareFhirResourceType? resourceType = null, string resourceFhirAccount = null, string resourceFhirId = null, long? resourceVersionId = null)
- {
- return new HealthcareFhirResourceEventBaseProperties(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId);
+ /// Initializes a new instance of HealthcareFhirResourceCreatedEventData.
+ /// Type of HL7 FHIR resource.
+ /// Domain name of FHIR account for this resource.
+ /// Id of HL7 FHIR resource.
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ /// A new instance for mocking.
+ public static HealthcareFhirResourceCreatedEventData HealthcareFhirResourceCreatedEventData(HealthcareFhirResourceType? fhirResourceType = null, string fhirServiceHostName = null, string fhirResourceId = null, long? fhirResourceVersionId = null)
+ {
+ return new HealthcareFhirResourceCreatedEventData(fhirResourceType, fhirServiceHostName, fhirResourceId, fhirResourceVersionId);
+ }
+
+ /// Initializes a new instance of HealthcareFhirResourceUpdatedEventData.
+ /// Type of HL7 FHIR resource.
+ /// Domain name of FHIR account for this resource.
+ /// Id of HL7 FHIR resource.
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ /// A new instance for mocking.
+ public static HealthcareFhirResourceUpdatedEventData HealthcareFhirResourceUpdatedEventData(HealthcareFhirResourceType? fhirResourceType = null, string fhirServiceHostName = null, string fhirResourceId = null, long? fhirResourceVersionId = null)
+ {
+ return new HealthcareFhirResourceUpdatedEventData(fhirResourceType, fhirServiceHostName, fhirResourceId, fhirResourceVersionId);
+ }
+
+ /// Initializes a new instance of HealthcareFhirResourceDeletedEventData.
+ /// Type of HL7 FHIR resource.
+ /// Domain name of FHIR account for this resource.
+ /// Id of HL7 FHIR resource.
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ /// A new instance for mocking.
+ public static HealthcareFhirResourceDeletedEventData HealthcareFhirResourceDeletedEventData(HealthcareFhirResourceType? fhirResourceType = null, string fhirServiceHostName = null, string fhirResourceId = null, long? fhirResourceVersionId = null)
+ {
+ return new HealthcareFhirResourceDeletedEventData(fhirResourceType, fhirServiceHostName, fhirResourceId, fhirResourceVersionId);
}
}
}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceCreatedEventData.cs
index ee531eb1b3637..1cef0f7a5b04e 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceCreatedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceCreatedEventData.cs
@@ -8,7 +8,7 @@
namespace Azure.Messaging.EventGrid.SystemEvents
{
/// Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.FhirResourceCreated event.
- public partial class HealthcareFhirResourceCreatedEventData : HealthcareFhirResourceEventBaseProperties
+ public partial class HealthcareFhirResourceCreatedEventData
{
/// Initializes a new instance of HealthcareFhirResourceCreatedEventData.
internal HealthcareFhirResourceCreatedEventData()
@@ -16,12 +16,25 @@ internal HealthcareFhirResourceCreatedEventData()
}
/// Initializes a new instance of HealthcareFhirResourceCreatedEventData.
- /// Type of HL7 FHIR resource.
- /// Domain name of FHIR account for this resource.
- /// Id of HL7 FHIR resource.
- /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
- internal HealthcareFhirResourceCreatedEventData(HealthcareFhirResourceType? resourceType, string resourceFhirAccount, string resourceFhirId, long? resourceVersionId) : base(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId)
+ /// Type of HL7 FHIR resource.
+ /// Domain name of FHIR account for this resource.
+ /// Id of HL7 FHIR resource.
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ internal HealthcareFhirResourceCreatedEventData(HealthcareFhirResourceType? fhirResourceType, string fhirServiceHostName, string fhirResourceId, long? fhirResourceVersionId)
{
+ FhirResourceType = fhirResourceType;
+ FhirServiceHostName = fhirServiceHostName;
+ FhirResourceId = fhirResourceId;
+ FhirResourceVersionId = fhirResourceVersionId;
}
+
+ /// Type of HL7 FHIR resource.
+ public HealthcareFhirResourceType? FhirResourceType { get; }
+ /// Domain name of FHIR account for this resource.
+ public string FhirServiceHostName { get; }
+ /// Id of HL7 FHIR resource.
+ public string FhirResourceId { get; }
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ public long? FhirResourceVersionId { get; }
}
}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceDeletedEventData.cs
index 3521ed9023ca5..bddaf55a7d5d9 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceDeletedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceDeletedEventData.cs
@@ -8,7 +8,7 @@
namespace Azure.Messaging.EventGrid.SystemEvents
{
/// Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.FhirResourceDeleted event.
- public partial class HealthcareFhirResourceDeletedEventData : HealthcareFhirResourceEventBaseProperties
+ public partial class HealthcareFhirResourceDeletedEventData
{
/// Initializes a new instance of HealthcareFhirResourceDeletedEventData.
internal HealthcareFhirResourceDeletedEventData()
@@ -16,12 +16,25 @@ internal HealthcareFhirResourceDeletedEventData()
}
/// Initializes a new instance of HealthcareFhirResourceDeletedEventData.
- /// Type of HL7 FHIR resource.
- /// Domain name of FHIR account for this resource.
- /// Id of HL7 FHIR resource.
- /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
- internal HealthcareFhirResourceDeletedEventData(HealthcareFhirResourceType? resourceType, string resourceFhirAccount, string resourceFhirId, long? resourceVersionId) : base(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId)
+ /// Type of HL7 FHIR resource.
+ /// Domain name of FHIR account for this resource.
+ /// Id of HL7 FHIR resource.
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ internal HealthcareFhirResourceDeletedEventData(HealthcareFhirResourceType? fhirResourceType, string fhirServiceHostName, string fhirResourceId, long? fhirResourceVersionId)
{
+ FhirResourceType = fhirResourceType;
+ FhirServiceHostName = fhirServiceHostName;
+ FhirResourceId = fhirResourceId;
+ FhirResourceVersionId = fhirResourceVersionId;
}
+
+ /// Type of HL7 FHIR resource.
+ public HealthcareFhirResourceType? FhirResourceType { get; }
+ /// Domain name of FHIR account for this resource.
+ public string FhirServiceHostName { get; }
+ /// Id of HL7 FHIR resource.
+ public string FhirResourceId { get; }
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ public long? FhirResourceVersionId { get; }
}
}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceEventBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceEventBaseProperties.Serialization.cs
deleted file mode 100644
index a1e91f0ae9453..0000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceEventBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-//
-
-#nullable disable
-
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
- public partial class HealthcareFhirResourceEventBaseProperties
- {
- internal static HealthcareFhirResourceEventBaseProperties DeserializeHealthcareFhirResourceEventBaseProperties(JsonElement element)
- {
- Optional resourceType = default;
- Optional resourceFhirAccount = default;
- Optional resourceFhirId = default;
- Optional resourceVersionId = default;
- foreach (var property in element.EnumerateObject())
- {
- if (property.NameEquals("resourceType"))
- {
- if (property.Value.ValueKind == JsonValueKind.Null)
- {
- property.ThrowNonNullablePropertyIsNull();
- continue;
- }
- resourceType = new HealthcareFhirResourceType(property.Value.GetString());
- continue;
- }
- if (property.NameEquals("resourceFhirAccount"))
- {
- resourceFhirAccount = property.Value.GetString();
- continue;
- }
- if (property.NameEquals("resourceFhirId"))
- {
- resourceFhirId = property.Value.GetString();
- continue;
- }
- if (property.NameEquals("resourceVersionId"))
- {
- if (property.Value.ValueKind == JsonValueKind.Null)
- {
- property.ThrowNonNullablePropertyIsNull();
- continue;
- }
- resourceVersionId = property.Value.GetInt64();
- continue;
- }
- }
- return new HealthcareFhirResourceEventBaseProperties(Optional.ToNullable(resourceType), resourceFhirAccount.Value, resourceFhirId.Value, Optional.ToNullable(resourceVersionId));
- }
- }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceEventBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceEventBaseProperties.cs
deleted file mode 100644
index 26e7ce50839e8..0000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceEventBaseProperties.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-//
-
-#nullable disable
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
- /// Schema of common properties of all FhirResource events.
- public partial class HealthcareFhirResourceEventBaseProperties
- {
- /// Initializes a new instance of HealthcareFhirResourceEventBaseProperties.
- internal HealthcareFhirResourceEventBaseProperties()
- {
- }
-
- /// Initializes a new instance of HealthcareFhirResourceEventBaseProperties.
- /// Type of HL7 FHIR resource.
- /// Domain name of FHIR account for this resource.
- /// Id of HL7 FHIR resource.
- /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
- internal HealthcareFhirResourceEventBaseProperties(HealthcareFhirResourceType? resourceType, string resourceFhirAccount, string resourceFhirId, long? resourceVersionId)
- {
- ResourceType = resourceType;
- ResourceFhirAccount = resourceFhirAccount;
- ResourceFhirId = resourceFhirId;
- ResourceVersionId = resourceVersionId;
- }
-
- /// Type of HL7 FHIR resource.
- public HealthcareFhirResourceType? ResourceType { get; }
- /// Domain name of FHIR account for this resource.
- public string ResourceFhirAccount { get; }
- /// Id of HL7 FHIR resource.
- public string ResourceFhirId { get; }
- /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
- public long? ResourceVersionId { get; }
- }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceUpdatedEventData.cs
index 033023728d34d..e519c951be278 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceUpdatedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/HealthcareFhirResourceUpdatedEventData.cs
@@ -8,7 +8,7 @@
namespace Azure.Messaging.EventGrid.SystemEvents
{
/// Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.FhirResourceUpdated event.
- public partial class HealthcareFhirResourceUpdatedEventData : HealthcareFhirResourceEventBaseProperties
+ public partial class HealthcareFhirResourceUpdatedEventData
{
/// Initializes a new instance of HealthcareFhirResourceUpdatedEventData.
internal HealthcareFhirResourceUpdatedEventData()
@@ -16,12 +16,25 @@ internal HealthcareFhirResourceUpdatedEventData()
}
/// Initializes a new instance of HealthcareFhirResourceUpdatedEventData.
- /// Type of HL7 FHIR resource.
- /// Domain name of FHIR account for this resource.
- /// Id of HL7 FHIR resource.
- /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
- internal HealthcareFhirResourceUpdatedEventData(HealthcareFhirResourceType? resourceType, string resourceFhirAccount, string resourceFhirId, long? resourceVersionId) : base(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId)
+ /// Type of HL7 FHIR resource.
+ /// Domain name of FHIR account for this resource.
+ /// Id of HL7 FHIR resource.
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ internal HealthcareFhirResourceUpdatedEventData(HealthcareFhirResourceType? fhirResourceType, string fhirServiceHostName, string fhirResourceId, long? fhirResourceVersionId)
{
+ FhirResourceType = fhirResourceType;
+ FhirServiceHostName = fhirServiceHostName;
+ FhirResourceId = fhirResourceId;
+ FhirResourceVersionId = fhirResourceVersionId;
}
+
+ /// Type of HL7 FHIR resource.
+ public HealthcareFhirResourceType? FhirResourceType { get; }
+ /// Domain name of FHIR account for this resource.
+ public string FhirServiceHostName { get; }
+ /// Id of HL7 FHIR resource.
+ public string FhirResourceId { get; }
+ /// VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion).
+ public long? FhirResourceVersionId { get; }
}
}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md b/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md
index 758d93147f6e0..eb9ed383d11d7 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md
@@ -4,7 +4,7 @@ Run `dotnet build /t:GenerateCode` to generate code.
``` yaml
title: EventGridClient
-require: https://github.com/Azure/azure-rest-api-specs/blob/3b2098c19355859f41e88b2d8b43b04dde887af6/specification/eventgrid/data-plane/readme.md
+require: https://github.com/Azure/azure-rest-api-specs/blob/2234fa3b73fe516c3b67c9a1420ea253f5735e32/specification/eventgrid/data-plane/readme.md
```
## Swagger workarounds