diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props index e75e6ff0901aa..a2b13486bb833 100644 --- a/eng/Packages.Data.props +++ b/eng/Packages.Data.props @@ -223,7 +223,7 @@ All should have PrivateAssets="All" set so they don't become package dependencies --> - + diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json index 4568f07051825..6cd3e19b81b9f 100644 --- a/eng/emitter-package-lock.json +++ b/eng/emitter-package-lock.json @@ -5,11 +5,11 @@ "packages": { "": { "dependencies": { - "@azure-tools/typespec-csharp": "0.2.0-beta.20240423.3" + "@azure-tools/typespec-csharp": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-alpha.20240423.8.x.tgz" }, "devDependencies": { "@azure-tools/typespec-azure-core": "0.41.0", - "@azure-tools/typespec-client-generator-core": "0.42.0-dev.8", + "@azure-tools/typespec-client-generator-core": "0.41.4", "@typespec/compiler": "0.55.0", "@typespec/http": "0.55.0", "@typespec/openapi": "0.55.0", @@ -18,9 +18,9 @@ } }, "node_modules/@autorest/csharp": { - "version": "3.0.0-beta.20240423.3", - "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20240423.3.tgz", - "integrity": "sha512-w7GqqpY4qoL1L3j1bhh+CkQnRcjj58YzLOqKAMJazRbTYVfE63XtMQyxgueT+sh9wJo6BgR7D93stpOUDsRImA==" + "version": "3.0.0-alpha.20240423.8.x", + "resolved": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@autorest/csharp/-/csharp-3.0.0-alpha.20240423.8.x.tgz", + "integrity": "sha512-l2PwxA5Pke1wo/uue3Pu8fonEWfrBOQx2n9UNEf9ldsZnn8WLRtWpNagvoTB8eKRfwlGp9nqh0DTfGAGjX2SJQ==" }, "node_modules/@azure-tools/typespec-azure-core": { "version": "0.41.0", @@ -37,37 +37,38 @@ } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.42.0-dev.8", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.42.0-dev.8.tgz", - "integrity": "sha512-Kpelh/TOBp/Pv5h0IisGcWJ7CnHi340qxy2k514qAbiGWTfeqw3Q8PAHPf68MsRGgVXq+r/DljEDtE3oSMAVjA==", + "version": "0.41.4", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.41.4.tgz", + "integrity": "sha512-aKI4PSNsc49YoxzfqDT6f7WDYaXIhslZyISKGrh10OaL3YlED2N0X5pJm76mSZvhbTvPYIkqbDkxD+shq4wCVQ==", "dev": true, "dependencies": { - "change-case": "~5.4.3", + "change-case": "~5.4.4", "pluralize": "^8.0.0" }, "engines": { "node": ">=18.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "~0.41.0 || >=0.42.0-dev <0.42.0", - "@typespec/compiler": "~0.55.0 || >=0.56.0-dev <0.56.0", - "@typespec/http": "~0.55.0 || >=0.56.0-dev <0.56.0", - "@typespec/rest": "~0.55.0 || >=0.56.0-dev <0.56.0", - "@typespec/versioning": "~0.55.0 || >=0.56.0-dev <0.56.0" + "@azure-tools/typespec-azure-core": "~0.41.0", + "@typespec/compiler": "~0.55.0", + "@typespec/http": "~0.55.0", + "@typespec/rest": "~0.55.0", + "@typespec/versioning": "~0.55.0" } }, "node_modules/@azure-tools/typespec-csharp": { - "version": "0.2.0-beta.20240423.3", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-beta.20240423.3.tgz", - "integrity": "sha512-hiLRALzkHGSe2LHGQaFSCzBkKcp+5v2I0lv/SMNATfWWlSlzHNvAn6kS2+ukKiOC+J41TC05r9jywAUidQMkRQ==", + "version": "0.2.0-alpha.20240423.8.x", + "resolved": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-alpha.20240423.8.x.tgz", + "integrity": "sha512-o6nVnNaZgOYW7eQoeFha6YDOljR8nV6XKG8pSOmJo1icoMJcLnRiHaxZUXRjNEev/6V9gC33HHFrPUdxnzfroA==", + "license": "MIT", "dependencies": { - "@autorest/csharp": "3.0.0-beta.20240423.3", + "@autorest/csharp": "3.0.0-alpha.20240423.8.x", "json-serialize-refs": "0.1.0-0", "winston": "^3.8.2" }, "peerDependencies": { "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": "0.42.0-dev.8 || >=0.36.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.36.0 <1.0.0", "@typespec/compiler": ">=0.50.0 <1.0.0", "@typespec/http": ">=0.50.0 <1.0.0", "@typespec/openapi": ">=0.50.0 <1.0.0", diff --git a/eng/emitter-package.json b/eng/emitter-package.json index 6a4bce8d6b748..3b40aed0f2bca 100644 --- a/eng/emitter-package.json +++ b/eng/emitter-package.json @@ -1,15 +1,18 @@ { "main": "dist/src/index.js", "dependencies": { - "@azure-tools/typespec-csharp": "0.2.0-beta.20240423.3" + "@azure-tools/typespec-csharp": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-alpha.20240423.8.x.tgz" }, "devDependencies": { "@azure-tools/typespec-azure-core": "0.41.0", "@typespec/compiler": "0.55.0", - "@azure-tools/typespec-client-generator-core": "0.42.0-dev.8", - "@typespec/http": "0.55.0", "@typespec/rest": "0.55.0", "@typespec/versioning": "0.55.0", - "@typespec/openapi": "0.55.0" + "@azure-tools/typespec-client-generator-core": "0.41.4", + "@typespec/openapi": "0.55.0", + "@typespec/http": "0.55.0" + }, + "overrides": { + "@autorest/csharp": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@autorest/csharp/-/csharp-3.0.0-alpha.20240423.8.x.tgz" } } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DeploymentEnvironmentsClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DeploymentEnvironmentsClient.cs index cc35748b809f8..de5ebaf8e39b0 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DeploymentEnvironmentsClient.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DeploymentEnvironmentsClient.cs @@ -70,7 +70,7 @@ public DeploymentEnvironmentsClient(Uri endpoint, TokenCredential credential, De /// , or is null. /// , or is an empty string, and was expected to be non-empty. /// - public virtual async Task> GetEnvironmentAsync(string projectName, string userId, string environmentName, CancellationToken cancellationToken = default) + public virtual async Task> GetEnvironmentAsync(string projectName, string userId, string environmentName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(userId, nameof(userId)); @@ -78,7 +78,7 @@ public virtual async Task> GetEnvironmentAsync(st RequestContext context = FromCancellationToken(cancellationToken); Response response = await GetEnvironmentAsync(projectName, userId, environmentName, context).ConfigureAwait(false); - return Response.FromValue(DevCenterEnvironment.FromResponse(response), response); + return Response.FromValue(Models.Environment.FromResponse(response), response); } /// Gets an environment. @@ -89,7 +89,7 @@ public virtual async Task> GetEnvironmentAsync(st /// , or is null. /// , or is an empty string, and was expected to be non-empty. /// - public virtual Response GetEnvironment(string projectName, string userId, string environmentName, CancellationToken cancellationToken = default) + public virtual Response GetEnvironment(string projectName, string userId, string environmentName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(userId, nameof(userId)); @@ -97,7 +97,7 @@ public virtual Response GetEnvironment(string projectName, RequestContext context = FromCancellationToken(cancellationToken); Response response = GetEnvironment(projectName, userId, environmentName, context); - return Response.FromValue(DevCenterEnvironment.FromResponse(response), response); + return Response.FromValue(Models.Environment.FromResponse(response), response); } /// @@ -195,14 +195,14 @@ public virtual Response GetEnvironment(string projectName, string userId, string /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual async Task> GetCatalogAsync(string projectName, string catalogName, CancellationToken cancellationToken = default) + public virtual async Task> GetCatalogAsync(string projectName, string catalogName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(catalogName, nameof(catalogName)); RequestContext context = FromCancellationToken(cancellationToken); Response response = await GetCatalogAsync(projectName, catalogName, context).ConfigureAwait(false); - return Response.FromValue(DevCenterCatalog.FromResponse(response), response); + return Response.FromValue(Catalog.FromResponse(response), response); } /// Gets the specified catalog within the project. @@ -212,14 +212,14 @@ public virtual async Task> GetCatalogAsync(string pro /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual Response GetCatalog(string projectName, string catalogName, CancellationToken cancellationToken = default) + public virtual Response GetCatalog(string projectName, string catalogName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(catalogName, nameof(catalogName)); RequestContext context = FromCancellationToken(cancellationToken); Response response = GetCatalog(projectName, catalogName, context); - return Response.FromValue(DevCenterCatalog.FromResponse(response), response); + return Response.FromValue(Catalog.FromResponse(response), response); } /// @@ -438,14 +438,14 @@ public virtual Response GetEnvironmentDefinition(string projectName, string cata /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual AsyncPageable GetAllEnvironmentsAsync(string projectName, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetAllEnvironmentsAsync(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetAllEnvironmentsRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetAllEnvironmentsNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevCenterEnvironment.DeserializeDevCenterEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetAllEnvironments", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => Models.Environment.DeserializeEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetAllEnvironments", "value", "nextLink", context); } /// Lists the environments for a project. @@ -454,14 +454,14 @@ public virtual AsyncPageable GetAllEnvironmentsAsync(strin /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual Pageable GetAllEnvironments(string projectName, CancellationToken cancellationToken = default) + public virtual Pageable GetAllEnvironments(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetAllEnvironmentsRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetAllEnvironmentsNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevCenterEnvironment.DeserializeDevCenterEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetAllEnvironments", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => Models.Environment.DeserializeEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetAllEnvironments", "value", "nextLink", context); } /// @@ -533,7 +533,7 @@ public virtual Pageable GetAllEnvironments(string projectName, Reque /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual AsyncPageable GetEnvironmentsAsync(string projectName, string userId, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetEnvironmentsAsync(string projectName, string userId, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(userId, nameof(userId)); @@ -541,7 +541,7 @@ public virtual AsyncPageable GetEnvironmentsAsync(string p RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetEnvironmentsRequest(projectName, userId, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetEnvironmentsNextPageRequest(nextLink, projectName, userId, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevCenterEnvironment.DeserializeDevCenterEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironments", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => Models.Environment.DeserializeEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironments", "value", "nextLink", context); } /// Lists the environments for a project and user. @@ -551,7 +551,7 @@ public virtual AsyncPageable GetEnvironmentsAsync(string p /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual Pageable GetEnvironments(string projectName, string userId, CancellationToken cancellationToken = default) + public virtual Pageable GetEnvironments(string projectName, string userId, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(userId, nameof(userId)); @@ -559,7 +559,7 @@ public virtual Pageable GetEnvironments(string projectName RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetEnvironmentsRequest(projectName, userId, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetEnvironmentsNextPageRequest(nextLink, projectName, userId, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevCenterEnvironment.DeserializeDevCenterEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironments", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => Models.Environment.DeserializeEnvironment(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironments", "value", "nextLink", context); } /// @@ -634,14 +634,14 @@ public virtual Pageable GetEnvironments(string projectName, string u /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual AsyncPageable GetCatalogsAsync(string projectName, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetCatalogsAsync(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetCatalogsRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetCatalogsNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevCenterCatalog.DeserializeDevCenterCatalog(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetCatalogs", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => Catalog.DeserializeCatalog(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetCatalogs", "value", "nextLink", context); } /// Lists all of the catalogs available for a project. @@ -650,14 +650,14 @@ public virtual AsyncPageable GetCatalogsAsync(string projectNa /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual Pageable GetCatalogs(string projectName, CancellationToken cancellationToken = default) + public virtual Pageable GetCatalogs(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetCatalogsRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetCatalogsNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevCenterCatalog.DeserializeDevCenterCatalog(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetCatalogs", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => Catalog.DeserializeCatalog(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetCatalogs", "value", "nextLink", context); } /// @@ -924,14 +924,14 @@ public virtual Pageable GetEnvironmentDefinitionsByCatalog(string pr /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual AsyncPageable GetEnvironmentTypesAsync(string projectName, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetEnvironmentTypesAsync(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetEnvironmentTypesRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetEnvironmentTypesNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevCenterEnvironmentType.DeserializeDevCenterEnvironmentType(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironmentTypes", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => EnvironmentType.DeserializeEnvironmentType(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironmentTypes", "value", "nextLink", context); } /// Lists all environment types configured for a project. @@ -940,14 +940,14 @@ public virtual AsyncPageable GetEnvironmentTypesAsync( /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual Pageable GetEnvironmentTypes(string projectName, CancellationToken cancellationToken = default) + public virtual Pageable GetEnvironmentTypes(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetEnvironmentTypesRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetEnvironmentTypesNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevCenterEnvironmentType.DeserializeDevCenterEnvironmentType(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironmentTypes", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => EnvironmentType.DeserializeEnvironmentType(e), ClientDiagnostics, _pipeline, "DeploymentEnvironmentsClient.GetEnvironmentTypes", "value", "nextLink", context); } /// diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevBoxesClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevBoxesClient.cs index e657c7524da0d..5b38c6c325060 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevBoxesClient.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevBoxesClient.cs @@ -69,14 +69,14 @@ public DevBoxesClient(Uri endpoint, TokenCredential credential, DevCenterClientO /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual async Task> GetPoolAsync(string projectName, string poolName, CancellationToken cancellationToken = default) + public virtual async Task> GetPoolAsync(string projectName, string poolName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(poolName, nameof(poolName)); RequestContext context = FromCancellationToken(cancellationToken); Response response = await GetPoolAsync(projectName, poolName, context).ConfigureAwait(false); - return Response.FromValue(DevBoxPool.FromResponse(response), response); + return Response.FromValue(Pool.FromResponse(response), response); } /// Gets a pool. @@ -86,14 +86,14 @@ public virtual async Task> GetPoolAsync(string projectName, /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual Response GetPool(string projectName, string poolName, CancellationToken cancellationToken = default) + public virtual Response GetPool(string projectName, string poolName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(poolName, nameof(poolName)); RequestContext context = FromCancellationToken(cancellationToken); Response response = GetPool(projectName, poolName, context); - return Response.FromValue(DevBoxPool.FromResponse(response), response); + return Response.FromValue(Pool.FromResponse(response), response); } /// @@ -188,7 +188,7 @@ public virtual Response GetPool(string projectName, string poolName, RequestCont /// , or is null. /// , or is an empty string, and was expected to be non-empty. /// - public virtual async Task> GetScheduleAsync(string projectName, string poolName, string scheduleName, CancellationToken cancellationToken = default) + public virtual async Task> GetScheduleAsync(string projectName, string poolName, string scheduleName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(poolName, nameof(poolName)); @@ -196,7 +196,7 @@ public virtual async Task> GetScheduleAsync(string proj RequestContext context = FromCancellationToken(cancellationToken); Response response = await GetScheduleAsync(projectName, poolName, scheduleName, context).ConfigureAwait(false); - return Response.FromValue(DevBoxSchedule.FromResponse(response), response); + return Response.FromValue(Schedule.FromResponse(response), response); } /// Gets a schedule. @@ -207,7 +207,7 @@ public virtual async Task> GetScheduleAsync(string proj /// , or is null. /// , or is an empty string, and was expected to be non-empty. /// - public virtual Response GetSchedule(string projectName, string poolName, string scheduleName, CancellationToken cancellationToken = default) + public virtual Response GetSchedule(string projectName, string poolName, string scheduleName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(poolName, nameof(poolName)); @@ -215,7 +215,7 @@ public virtual Response GetSchedule(string projectName, string p RequestContext context = FromCancellationToken(cancellationToken); Response response = GetSchedule(projectName, poolName, scheduleName, context); - return Response.FromValue(DevBoxSchedule.FromResponse(response), response); + return Response.FromValue(Schedule.FromResponse(response), response); } /// @@ -920,14 +920,14 @@ public virtual Response DelayAction(string projectName, string userId, string de /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual AsyncPageable GetPoolsAsync(string projectName, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetPoolsAsync(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetPoolsRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetPoolsNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevBoxPool.DeserializeDevBoxPool(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetPools", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => Pool.DeserializePool(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetPools", "value", "nextLink", context); } /// Lists available pools. @@ -936,14 +936,14 @@ public virtual AsyncPageable GetPoolsAsync(string projectName, Cance /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual Pageable GetPools(string projectName, CancellationToken cancellationToken = default) + public virtual Pageable GetPools(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetPoolsRequest(projectName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetPoolsNextPageRequest(nextLink, projectName, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevBoxPool.DeserializeDevBoxPool(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetPools", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => Pool.DeserializePool(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetPools", "value", "nextLink", context); } /// @@ -1015,7 +1015,7 @@ public virtual Pageable GetPools(string projectName, RequestContext /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual AsyncPageable GetSchedulesAsync(string projectName, string poolName, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetSchedulesAsync(string projectName, string poolName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(poolName, nameof(poolName)); @@ -1023,7 +1023,7 @@ public virtual AsyncPageable GetSchedulesAsync(string projectNam RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetSchedulesRequest(projectName, poolName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetSchedulesNextPageRequest(nextLink, projectName, poolName, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevBoxSchedule.DeserializeDevBoxSchedule(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetSchedules", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => Schedule.DeserializeSchedule(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetSchedules", "value", "nextLink", context); } /// Lists available schedules for a pool. @@ -1033,7 +1033,7 @@ public virtual AsyncPageable GetSchedulesAsync(string projectNam /// or is null. /// or is an empty string, and was expected to be non-empty. /// - public virtual Pageable GetSchedules(string projectName, string poolName, CancellationToken cancellationToken = default) + public virtual Pageable GetSchedules(string projectName, string poolName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(poolName, nameof(poolName)); @@ -1041,7 +1041,7 @@ public virtual Pageable GetSchedules(string projectName, string RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetSchedulesRequest(projectName, poolName, context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetSchedulesNextPageRequest(nextLink, projectName, poolName, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevBoxSchedule.DeserializeDevBoxSchedule(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetSchedules", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => Schedule.DeserializeSchedule(e), ClientDiagnostics, _pipeline, "DevBoxesClient.GetSchedules", "value", "nextLink", context); } /// diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterClient.cs index ea297803f580e..c04a2a6c58566 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterClient.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterClient.cs @@ -50,13 +50,13 @@ protected DevCenterClient() /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual async Task> GetProjectAsync(string projectName, CancellationToken cancellationToken = default) + public virtual async Task> GetProjectAsync(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = FromCancellationToken(cancellationToken); Response response = await GetProjectAsync(projectName, context).ConfigureAwait(false); - return Response.FromValue(DevCenterProject.FromResponse(response), response); + return Response.FromValue(Project.FromResponse(response), response); } /// Gets a project. @@ -65,13 +65,13 @@ public virtual async Task> GetProjectAsync(string pro /// is null. /// is an empty string, and was expected to be non-empty. /// - public virtual Response GetProject(string projectName, CancellationToken cancellationToken = default) + public virtual Response GetProject(string projectName, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); RequestContext context = FromCancellationToken(cancellationToken); Response response = GetProject(projectName, context); - return Response.FromValue(DevCenterProject.FromResponse(response), response); + return Response.FromValue(Project.FromResponse(response), response); } /// @@ -157,23 +157,23 @@ public virtual Response GetProject(string projectName, RequestContext context) /// Lists all projects. /// The cancellation token to use. /// - public virtual AsyncPageable GetProjectsAsync(CancellationToken cancellationToken = default) + public virtual AsyncPageable GetProjectsAsync(CancellationToken cancellationToken = default) { RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, context); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DevCenterProject.DeserializeDevCenterProject(e), ClientDiagnostics, _pipeline, "DevCenterClient.GetProjects", "value", "nextLink", context); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => Project.DeserializeProject(e), ClientDiagnostics, _pipeline, "DevCenterClient.GetProjects", "value", "nextLink", context); } /// Lists all projects. /// The cancellation token to use. /// - public virtual Pageable GetProjects(CancellationToken cancellationToken = default) + public virtual Pageable GetProjects(CancellationToken cancellationToken = default) { RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(context); HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, context); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DevCenterProject.DeserializeDevCenterProject(e), ClientDiagnostics, _pipeline, "DevCenterClient.GetProjects", "value", "nextLink", context); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => Project.DeserializeProject(e), ClientDiagnostics, _pipeline, "DevCenterClient.GetProjects", "value", "nextLink", context); } /// diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterModelFactory.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterModelFactory.cs index 8c78e318abc89..a996342f23c8a 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterModelFactory.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/DevCenterModelFactory.cs @@ -15,20 +15,20 @@ namespace Azure.Developer.DevCenter.Models /// Model factory for models. public static partial class DevCenterModelFactory { - /// Initializes a new instance of . + /// Initializes a new instance of . /// Name of the project. /// Description of the project. /// /// When specified, indicates the maximum number of Dev Boxes a single user can /// create across all pools in the project. /// - /// A new instance for mocking. - public static DevCenterProject DevCenterProject(string name = null, string description = null, int? maxDevBoxesPerUser = null) + /// A new instance for mocking. + public static Project Project(string name = null, string description = null, int? maxDevBoxesPerUser = null) { - return new DevCenterProject(name, description, maxDevBoxesPerUser, serializedAdditionalRawData: null); + return new Project(name, description, maxDevBoxesPerUser, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Pool name. /// Azure region where Dev Boxes in the pool are located. /// The operating system type of Dev Boxes in this pool. @@ -45,10 +45,10 @@ public static DevCenterProject DevCenterProject(string name = null, string descr /// Overall health status of the Pool. Indicates whether or not the Pool is /// available to create Dev Boxes. /// - /// A new instance for mocking. - public static DevBoxPool DevBoxPool(string name = null, AzureLocation location = default, DevBoxOSType? osType = null, DevBoxHardwareProfile hardwareProfile = null, HibernateSupport? hibernateSupport = null, DevBoxStorageProfile storageProfile = null, DevBoxImageReference imageReference = null, LocalAdministratorStatus? localAdministratorStatus = null, StopOnDisconnectConfiguration stopOnDisconnect = null, PoolHealthStatus healthStatus = default) + /// A new instance for mocking. + public static Pool Pool(string name = null, AzureLocation location = default, DevBoxOSType? osType = null, HardwareProfile hardwareProfile = null, HibernateSupport? hibernateSupport = null, StorageProfile storageProfile = null, ImageReference imageReference = null, LocalAdministratorStatus? localAdministratorStatus = null, StopOnDisconnectConfiguration stopOnDisconnect = null, PoolHealthStatus healthStatus = default) { - return new DevBoxPool( + return new Pool( name, location, osType, @@ -62,42 +62,42 @@ public static DevBoxPool DevBoxPool(string name = null, AzureLocation location = serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The name of the SKU. /// The number of vCPUs available for the Dev Box. /// The amount of memory available for the Dev Box. - /// A new instance for mocking. - public static DevBoxHardwareProfile DevBoxHardwareProfile(SkuName? skuName = null, int? vcpUs = null, int? memoryGB = null) + /// A new instance for mocking. + public static HardwareProfile HardwareProfile(SkuName? skuName = null, int? vcpUs = null, int? memoryGB = null) { - return new DevBoxHardwareProfile(skuName, vcpUs, memoryGB, serializedAdditionalRawData: null); + return new HardwareProfile(skuName, vcpUs, memoryGB, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Settings for the operating system disk. - /// A new instance for mocking. - public static DevBoxStorageProfile DevBoxStorageProfile(OSDisk osDisk = null) + /// A new instance for mocking. + public static StorageProfile StorageProfile(OsDisk osDisk = null) { - return new DevBoxStorageProfile(osDisk, serializedAdditionalRawData: null); + return new StorageProfile(osDisk, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The size of the OS Disk in gigabytes. - /// A new instance for mocking. - public static OSDisk OSDisk(int? diskSizeGB = null) + /// A new instance for mocking. + public static OsDisk OsDisk(int? diskSizeGB = null) { - return new OSDisk(diskSizeGB, serializedAdditionalRawData: null); + return new OsDisk(diskSizeGB, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The name of the image used. /// The version of the image. /// The operating system of the image. /// The operating system build number of the image. /// The datetime that the backing image version was published. - /// A new instance for mocking. - public static DevBoxImageReference DevBoxImageReference(string name = null, string version = null, string operatingSystem = null, string osBuildNumber = null, DateTimeOffset? publishedDate = null) + /// A new instance for mocking. + public static ImageReference ImageReference(string name = null, string version = null, string operatingSystem = null, string osBuildNumber = null, DateTimeOffset? publishedDate = null) { - return new DevBoxImageReference( + return new ImageReference( name, version, operatingSystem, @@ -121,16 +121,16 @@ public static StopOnDisconnectConfiguration StopOnDisconnectConfiguration(StopOn return new StopOnDisconnectConfiguration(status, gracePeriodMinutes, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Display name for the Schedule. /// Supported type this scheduled task represents. /// The frequency of this scheduled task. /// The target time to trigger the action. The format is HH:MM. /// The IANA timezone id at which the schedule should execute. - /// A new instance for mocking. - public static DevBoxSchedule DevBoxSchedule(string name = null, ScheduleType scheduleType = default, ScheduleFrequency scheduleFrequency = default, string time = null, string timeZone = null) + /// A new instance for mocking. + public static Schedule Schedule(string name = null, ScheduleType scheduleType = default, ScheduleFrequency scheduleFrequency = default, string time = null, string timeZone = null) { - return new DevBoxSchedule( + return new Schedule( name, scheduleType, scheduleFrequency, @@ -167,7 +167,7 @@ public static DevBoxSchedule DevBoxSchedule(string name = null, ScheduleType sch /// Creation time of this Dev Box. /// Indicates whether the owner of the Dev Box is a local administrator. /// A new instance for mocking. - public static DevBox DevBox(string name = null, string projectName = null, string poolName = null, HibernateSupport? hibernateSupport = null, DevBoxProvisioningState? provisioningState = null, string actionState = null, PowerState? powerState = null, Guid? uniqueId = null, ResponseError error = null, AzureLocation? location = null, DevBoxOSType? osType = null, Guid? userId = null, DevBoxHardwareProfile hardwareProfile = null, DevBoxStorageProfile storageProfile = null, DevBoxImageReference imageReference = null, DateTimeOffset? createdTime = null, LocalAdministratorStatus? localAdministratorStatus = null) + public static DevBox DevBox(string name = null, string projectName = null, string poolName = null, HibernateSupport? hibernateSupport = null, DevBoxProvisioningState? provisioningState = null, string actionState = null, PowerState? powerState = null, Guid? uniqueId = null, ResponseError error = null, AzureLocation? location = null, DevBoxOSType? osType = null, Guid? userId = null, HardwareProfile hardwareProfile = null, StorageProfile storageProfile = null, ImageReference imageReference = null, DateTimeOffset? createdTime = null, LocalAdministratorStatus? localAdministratorStatus = null) { return new DevBox( name, @@ -236,7 +236,7 @@ public static DevBoxActionDelayResult DevBoxActionDelayResult(string actionName return new DevBoxActionDelayResult(actionName, delayStatus, action, error, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Parameters object for the environment. /// Environment name. /// Environment type. @@ -246,12 +246,12 @@ public static DevBoxActionDelayResult DevBoxActionDelayResult(string actionName /// Name of the catalog. /// Name of the environment definition. /// Provisioning error details. Populated only for error states. - /// A new instance for mocking. - public static DevCenterEnvironment DevCenterEnvironment(IDictionary parameters = null, string name = null, string environmentTypeName = null, Guid? userId = null, EnvironmentProvisioningState? provisioningState = null, ResourceIdentifier resourceGroupId = null, string catalogName = null, string environmentDefinitionName = null, ResponseError error = null) + /// A new instance for mocking. + public static Environment Environment(IDictionary parameters = null, string name = null, string environmentTypeName = null, Guid? userId = null, EnvironmentProvisioningState? provisioningState = null, string resourceGroupId = null, string catalogName = null, string environmentDefinitionName = null, ResponseError error = null) { parameters ??= new Dictionary(); - return new DevCenterEnvironment( + return new Environment( parameters, name, environmentTypeName, @@ -264,12 +264,12 @@ public static DevCenterEnvironment DevCenterEnvironment(IDictionary Initializes a new instance of . + /// Initializes a new instance of . /// Name of the catalog. - /// A new instance for mocking. - public static DevCenterCatalog DevCenterCatalog(string name = null) + /// A new instance for mocking. + public static Catalog Catalog(string name = null) { - return new DevCenterCatalog(name, serializedAdditionalRawData: null); + return new Catalog(name, serializedAdditionalRawData: null); } /// Initializes a new instance of . @@ -328,7 +328,7 @@ public static EnvironmentDefinitionParameter EnvironmentDefinitionParameter(stri serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Name of the environment type. /// /// Id of a subscription or management group that the environment type will be @@ -336,10 +336,10 @@ public static EnvironmentDefinitionParameter EnvironmentDefinitionParameter(stri /// or management group. /// /// Indicates whether this environment type is enabled for use in this project. - /// A new instance for mocking. - public static DevCenterEnvironmentType DevCenterEnvironmentType(string name = null, ResourceIdentifier deploymentTargetId = null, EnvironmentTypeStatus status = default) + /// A new instance for mocking. + public static EnvironmentType EnvironmentType(string name = null, string deploymentTargetId = null, EnvironmentTypeStatus status = default) { - return new DevCenterEnvironmentType(name, deploymentTargetId, status, serializedAdditionalRawData: null); + return new EnvironmentType(name, deploymentTargetId, status, serializedAdditionalRawData: null); } } } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DeploymentEnvironmentsClient.xml b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DeploymentEnvironmentsClient.xml index 4cab4d449bb50..f536292385898 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DeploymentEnvironmentsClient.xml +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DeploymentEnvironmentsClient.xml @@ -9,7 +9,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = await client.GetEnvironmentAsync("", "", ""); +Response response = await client.GetEnvironmentAsync("", "", ""); ]]> This sample shows how to call GetEnvironmentAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = await client.GetEnvironmentAsync("", "", ""); +Response response = await client.GetEnvironmentAsync("", "", ""); ]]> @@ -28,7 +28,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = client.GetEnvironment("", "", ""); +Response response = client.GetEnvironment("", "", ""); ]]> This sample shows how to call GetEnvironment with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = client.GetEnvironment("", "", ""); +Response response = client.GetEnvironment("", "", ""); ]]> @@ -125,7 +125,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = await client.GetCatalogAsync("", ""); +Response response = await client.GetCatalogAsync("", ""); ]]> This sample shows how to call GetCatalogAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = await client.GetCatalogAsync("", ""); +Response response = await client.GetCatalogAsync("", ""); ]]> @@ -144,7 +144,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = client.GetCatalog("", ""); +Response response = client.GetCatalog("", ""); ]]> This sample shows how to call GetCatalog with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -Response response = client.GetCatalog("", ""); +Response response = client.GetCatalog("", ""); ]]> @@ -331,7 +331,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterEnvironment item in client.GetAllEnvironmentsAsync("")) +await foreach (Models.Environment item in client.GetAllEnvironmentsAsync("")) { } ]]> @@ -341,7 +341,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterEnvironment item in client.GetAllEnvironmentsAsync("")) +await foreach (Models.Environment item in client.GetAllEnvironmentsAsync("")) { } ]]> @@ -354,7 +354,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterEnvironment item in client.GetAllEnvironments("")) +foreach (Models.Environment item in client.GetAllEnvironments("")) { } ]]> @@ -364,7 +364,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterEnvironment item in client.GetAllEnvironments("")) +foreach (Models.Environment item in client.GetAllEnvironments("")) { } ]]> @@ -459,7 +459,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterEnvironment item in client.GetEnvironmentsAsync("", "")) +await foreach (Models.Environment item in client.GetEnvironmentsAsync("", "")) { } ]]> @@ -469,7 +469,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterEnvironment item in client.GetEnvironmentsAsync("", "")) +await foreach (Models.Environment item in client.GetEnvironmentsAsync("", "")) { } ]]> @@ -482,7 +482,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterEnvironment item in client.GetEnvironments("", "")) +foreach (Models.Environment item in client.GetEnvironments("", "")) { } ]]> @@ -492,7 +492,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterEnvironment item in client.GetEnvironments("", "")) +foreach (Models.Environment item in client.GetEnvironments("", "")) { } ]]> @@ -587,7 +587,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterCatalog item in client.GetCatalogsAsync("")) +await foreach (Catalog item in client.GetCatalogsAsync("")) { } ]]> @@ -597,7 +597,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterCatalog item in client.GetCatalogsAsync("")) +await foreach (Catalog item in client.GetCatalogsAsync("")) { } ]]> @@ -610,7 +610,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterCatalog item in client.GetCatalogs("")) +foreach (Catalog item in client.GetCatalogs("")) { } ]]> @@ -620,7 +620,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterCatalog item in client.GetCatalogs("")) +foreach (Catalog item in client.GetCatalogs("")) { } ]]> @@ -947,7 +947,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypesAsync("")) +await foreach (EnvironmentType item in client.GetEnvironmentTypesAsync("")) { } ]]> @@ -957,7 +957,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -await foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypesAsync("")) +await foreach (EnvironmentType item in client.GetEnvironmentTypesAsync("")) { } ]]> @@ -970,7 +970,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypes("")) +foreach (EnvironmentType item in client.GetEnvironmentTypes("")) { } ]]> @@ -980,7 +980,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); -foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypes("")) +foreach (EnvironmentType item in client.GetEnvironmentTypes("")) { } ]]> diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml index 5f33277fbe27a..817b425733a46 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml @@ -9,7 +9,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = await client.GetPoolAsync("", ""); +Response response = await client.GetPoolAsync("", ""); ]]> This sample shows how to call GetPoolAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = await client.GetPoolAsync("", ""); +Response response = await client.GetPoolAsync("", ""); ]]> @@ -28,7 +28,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = client.GetPool("", ""); +Response response = client.GetPool("", ""); ]]> This sample shows how to call GetPool with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = client.GetPool("", ""); +Response response = client.GetPool("", ""); ]]> @@ -133,7 +133,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = await client.GetScheduleAsync("", "", ""); +Response response = await client.GetScheduleAsync("", "", ""); ]]> This sample shows how to call GetScheduleAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = await client.GetScheduleAsync("", "", ""); +Response response = await client.GetScheduleAsync("", "", ""); ]]> @@ -152,7 +152,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = client.GetSchedule("", "", ""); +Response response = client.GetSchedule("", "", ""); ]]> This sample shows how to call GetSchedule with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -Response response = client.GetSchedule("", "", ""); +Response response = client.GetSchedule("", "", ""); ]]> @@ -713,7 +713,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -await foreach (DevBoxPool item in client.GetPoolsAsync("")) +await foreach (Pool item in client.GetPoolsAsync("")) { } ]]> @@ -723,7 +723,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -await foreach (DevBoxPool item in client.GetPoolsAsync("")) +await foreach (Pool item in client.GetPoolsAsync("")) { } ]]> @@ -736,7 +736,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -foreach (DevBoxPool item in client.GetPools("")) +foreach (Pool item in client.GetPools("")) { } ]]> @@ -746,7 +746,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -foreach (DevBoxPool item in client.GetPools("")) +foreach (Pool item in client.GetPools("")) { } ]]> @@ -849,7 +849,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -await foreach (DevBoxSchedule item in client.GetSchedulesAsync("", "")) +await foreach (Schedule item in client.GetSchedulesAsync("", "")) { } ]]> @@ -859,7 +859,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -await foreach (DevBoxSchedule item in client.GetSchedulesAsync("", "")) +await foreach (Schedule item in client.GetSchedulesAsync("", "")) { } ]]> @@ -872,7 +872,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -foreach (DevBoxSchedule item in client.GetSchedules("", "")) +foreach (Schedule item in client.GetSchedules("", "")) { } ]]> @@ -882,7 +882,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); -foreach (DevBoxSchedule item in client.GetSchedules("", "")) +foreach (Schedule item in client.GetSchedules("", "")) { } ]]> diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml index d043ea778f39e..71bf3bd5b1a3b 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml @@ -9,7 +9,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -Response response = await client.GetProjectAsync(""); +Response response = await client.GetProjectAsync(""); ]]> This sample shows how to call GetProjectAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -Response response = await client.GetProjectAsync(""); +Response response = await client.GetProjectAsync(""); ]]> @@ -28,7 +28,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -Response response = client.GetProject(""); +Response response = client.GetProject(""); ]]> This sample shows how to call GetProject with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -Response response = client.GetProject(""); +Response response = client.GetProject(""); ]]> @@ -101,7 +101,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -await foreach (DevCenterProject item in client.GetProjectsAsync()) +await foreach (Project item in client.GetProjectsAsync()) { } ]]> @@ -111,7 +111,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -await foreach (DevCenterProject item in client.GetProjectsAsync()) +await foreach (Project item in client.GetProjectsAsync()) { } ]]> @@ -124,7 +124,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -foreach (DevCenterProject item in client.GetProjects()) +foreach (Project item in client.GetProjects()) { } ]]> @@ -134,7 +134,7 @@ Uri endpoint = new Uri(""); TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); -foreach (DevCenterProject item in client.GetProjects()) +foreach (Project item in client.GetProjects()) { } ]]> diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterCatalog.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Catalog.Serialization.cs similarity index 65% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterCatalog.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Catalog.Serialization.cs index 2e84ca0135d84..fad247f03af3e 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterCatalog.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Catalog.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevCenterCatalog : IUtf8JsonSerializable, IJsonModel + public partial class Catalog : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterCatalog)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Catalog)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -49,19 +49,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteEndObject(); } - DevCenterCatalog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Catalog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterCatalog)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Catalog)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevCenterCatalog(document.RootElement, options); + return DeserializeCatalog(document.RootElement, options); } - internal static DevCenterCatalog DeserializeDevCenterCatalog(JsonElement element, ModelReaderWriterOptions options = null) + internal static Catalog DeserializeCatalog(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -85,46 +85,46 @@ internal static DevCenterCatalog DeserializeDevCenterCatalog(JsonElement element } } serializedAdditionalRawData = rawDataDictionary; - return new DevCenterCatalog(name, serializedAdditionalRawData); + return new Catalog(name, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevCenterCatalog)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Catalog)} does not support writing '{options.Format}' format."); } } - DevCenterCatalog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Catalog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevCenterCatalog(document.RootElement, options); + return DeserializeCatalog(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevCenterCatalog)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Catalog)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevCenterCatalog FromResponse(Response response) + internal static Catalog FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevCenterCatalog(document.RootElement); + return DeserializeCatalog(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterCatalog.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Catalog.cs similarity index 84% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterCatalog.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Catalog.cs index fb81f71106041..42cb750deab1f 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterCatalog.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Catalog.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// A catalog. - public partial class DevCenterCatalog + public partial class Catalog { /// /// Keeps track of any properties unknown to the library. @@ -45,15 +45,15 @@ public partial class DevCenterCatalog /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal DevCenterCatalog() + /// Initializes a new instance of . + internal Catalog() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Name of the catalog. /// Keeps track of any properties unknown to the library. - internal DevCenterCatalog(string name, IDictionary serializedAdditionalRawData) + internal Catalog(string name, IDictionary serializedAdditionalRawData) { Name = name; _serializedAdditionalRawData = serializedAdditionalRawData; diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.Serialization.cs index 066bf0bf65dde..e9b28c0f2a63d 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.Serialization.cs @@ -158,9 +158,9 @@ internal static DevBox DeserializeDevBox(JsonElement element, ModelReaderWriterO AzureLocation? location = default; DevBoxOSType? osType = default; Guid? user = default; - DevBoxHardwareProfile hardwareProfile = default; - DevBoxStorageProfile storageProfile = default; - DevBoxImageReference imageReference = default; + HardwareProfile hardwareProfile = default; + StorageProfile storageProfile = default; + ImageReference imageReference = default; DateTimeOffset? createdTime = default; LocalAdministratorStatus? localAdministrator = default; IDictionary serializedAdditionalRawData = default; @@ -265,7 +265,7 @@ internal static DevBox DeserializeDevBox(JsonElement element, ModelReaderWriterO { continue; } - hardwareProfile = DevBoxHardwareProfile.DeserializeDevBoxHardwareProfile(property.Value, options); + hardwareProfile = HardwareProfile.DeserializeHardwareProfile(property.Value, options); continue; } if (property.NameEquals("storageProfile"u8)) @@ -274,7 +274,7 @@ internal static DevBox DeserializeDevBox(JsonElement element, ModelReaderWriterO { continue; } - storageProfile = DevBoxStorageProfile.DeserializeDevBoxStorageProfile(property.Value, options); + storageProfile = StorageProfile.DeserializeStorageProfile(property.Value, options); continue; } if (property.NameEquals("imageReference"u8)) @@ -283,7 +283,7 @@ internal static DevBox DeserializeDevBox(JsonElement element, ModelReaderWriterO { continue; } - imageReference = DevBoxImageReference.DeserializeDevBoxImageReference(property.Value, options); + imageReference = ImageReference.DeserializeImageReference(property.Value, options); continue; } if (property.NameEquals("createdTime"u8)) diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.cs index 57e8e92069bbe..eda0fd9730c93 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBox.cs @@ -74,7 +74,7 @@ public partial class DevBox /// Creation time of this Dev Box. /// Indicates whether the owner of the Dev Box is a local administrator. /// Keeps track of any properties unknown to the library. - internal DevBox(string name, string projectName, string poolName, HibernateSupport? hibernateSupport, DevBoxProvisioningState? provisioningState, string actionState, PowerState? powerState, Guid? uniqueId, ResponseError error, AzureLocation? location, DevBoxOSType? osType, Guid? userId, DevBoxHardwareProfile hardwareProfile, DevBoxStorageProfile storageProfile, DevBoxImageReference imageReference, DateTimeOffset? createdTime, LocalAdministratorStatus? localAdministratorStatus, IDictionary serializedAdditionalRawData) + internal DevBox(string name, string projectName, string poolName, HibernateSupport? hibernateSupport, DevBoxProvisioningState? provisioningState, string actionState, PowerState? powerState, Guid? uniqueId, ResponseError error, AzureLocation? location, DevBoxOSType? osType, Guid? userId, HardwareProfile hardwareProfile, StorageProfile storageProfile, ImageReference imageReference, DateTimeOffset? createdTime, LocalAdministratorStatus? localAdministratorStatus, IDictionary serializedAdditionalRawData) { Name = name; ProjectName = projectName; @@ -135,11 +135,11 @@ internal DevBox() /// The AAD object id of the user this Dev Box is assigned to. public Guid? UserId { get; } /// Information about the Dev Box's hardware resources. - public DevBoxHardwareProfile HardwareProfile { get; } + public HardwareProfile HardwareProfile { get; } /// Storage settings for this Dev Box. - public DevBoxStorageProfile StorageProfile { get; } + public StorageProfile StorageProfile { get; } /// Information about the image used for this Dev Box. - public DevBoxImageReference ImageReference { get; } + public ImageReference ImageReference { get; } /// Creation time of this Dev Box. public DateTimeOffset? CreatedTime { get; } /// Indicates whether the owner of the Dev Box is a local administrator. diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironment.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Environment.Serialization.cs similarity index 79% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironment.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Environment.Serialization.cs index 6e10bfb230946..8229a86894cea 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironment.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Environment.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevCenterEnvironment : IUtf8JsonSerializable, IJsonModel + public partial class Environment : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterEnvironment)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Environment)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -98,19 +98,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WriteEndObject(); } - DevCenterEnvironment IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Environment IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterEnvironment)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Environment)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevCenterEnvironment(document.RootElement, options); + return DeserializeEnvironment(document.RootElement, options); } - internal static DevCenterEnvironment DeserializeDevCenterEnvironment(JsonElement element, ModelReaderWriterOptions options = null) + internal static Environment DeserializeEnvironment(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -123,7 +123,7 @@ internal static DevCenterEnvironment DeserializeDevCenterEnvironment(JsonElement string environmentType = default; Guid? user = default; EnvironmentProvisioningState? provisioningState = default; - ResourceIdentifier resourceGroupId = default; + string resourceGroupId = default; string catalogName = default; string environmentDefinitionName = default; ResponseError error = default; @@ -182,11 +182,7 @@ internal static DevCenterEnvironment DeserializeDevCenterEnvironment(JsonElement } if (property.NameEquals("resourceGroupId"u8)) { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - resourceGroupId = new ResourceIdentifier(property.Value.GetString()); + resourceGroupId = property.Value.GetString(); continue; } if (property.NameEquals("catalogName"u8)) @@ -214,7 +210,7 @@ internal static DevCenterEnvironment DeserializeDevCenterEnvironment(JsonElement } } serializedAdditionalRawData = rawDataDictionary; - return new DevCenterEnvironment( + return new Environment( parameters ?? new ChangeTrackingDictionary(), name, environmentType, @@ -227,43 +223,43 @@ internal static DevCenterEnvironment DeserializeDevCenterEnvironment(JsonElement serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevCenterEnvironment)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Environment)} does not support writing '{options.Format}' format."); } } - DevCenterEnvironment IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Environment IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevCenterEnvironment(document.RootElement, options); + return DeserializeEnvironment(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevCenterEnvironment)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Environment)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevCenterEnvironment FromResponse(Response response) + internal static Environment FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevCenterEnvironment(document.RootElement); + return DeserializeEnvironment(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironment.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Environment.cs similarity index 73% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironment.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Environment.cs index 77643ade52365..60b96ca72ea66 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironment.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Environment.cs @@ -7,12 +7,11 @@ using System; using System.Collections.Generic; -using Azure.Core; namespace Azure.Developer.DevCenter.Models { /// Properties of an environment. - public partial class DevCenterEnvironment + public partial class Environment { /// /// Keeps track of any properties unknown to the library. @@ -46,7 +45,24 @@ public partial class DevCenterEnvironment /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . + /// Environment type. + /// Name of the catalog. + /// Name of the environment definition. + /// , or is null. + public Environment(string environmentTypeName, string catalogName, string environmentDefinitionName) + { + Argument.AssertNotNull(environmentTypeName, nameof(environmentTypeName)); + Argument.AssertNotNull(catalogName, nameof(catalogName)); + Argument.AssertNotNull(environmentDefinitionName, nameof(environmentDefinitionName)); + + Parameters = new ChangeTrackingDictionary(); + EnvironmentTypeName = environmentTypeName; + CatalogName = catalogName; + EnvironmentDefinitionName = environmentDefinitionName; + } + + /// Initializes a new instance of . /// Parameters object for the environment. /// Environment name. /// Environment type. @@ -57,7 +73,7 @@ public partial class DevCenterEnvironment /// Name of the environment definition. /// Provisioning error details. Populated only for error states. /// Keeps track of any properties unknown to the library. - internal DevCenterEnvironment(IDictionary parameters, string name, string environmentTypeName, Guid? userId, EnvironmentProvisioningState? provisioningState, ResourceIdentifier resourceGroupId, string catalogName, string environmentDefinitionName, ResponseError error, IDictionary serializedAdditionalRawData) + internal Environment(IDictionary parameters, string name, string environmentTypeName, Guid? userId, EnvironmentProvisioningState? provisioningState, string resourceGroupId, string catalogName, string environmentDefinitionName, ResponseError error, IDictionary serializedAdditionalRawData) { Parameters = parameters; Name = name; @@ -71,8 +87,8 @@ internal DevCenterEnvironment(IDictionary parameters, string _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal DevCenterEnvironment() + /// Initializes a new instance of for deserialization. + internal Environment() { } @@ -115,6 +131,8 @@ internal DevCenterEnvironment() public Guid? UserId { get; } /// The provisioning state of the environment. public EnvironmentProvisioningState? ProvisioningState { get; } + /// The identifier of the resource group containing the environment's resources. + public string ResourceGroupId { get; } /// Name of the catalog. public string CatalogName { get; set; } /// Name of the environment definition. diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironmentType.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/EnvironmentType.Serialization.cs similarity index 64% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironmentType.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/EnvironmentType.Serialization.cs index f17dca7b2f2c0..86db1b006828d 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironmentType.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/EnvironmentType.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevCenterEnvironmentType : IUtf8JsonSerializable, IJsonModel + public partial class EnvironmentType : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterEnvironmentType)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(EnvironmentType)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -50,19 +50,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteEndObject(); } - DevCenterEnvironmentType IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + EnvironmentType IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterEnvironmentType)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(EnvironmentType)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevCenterEnvironmentType(document.RootElement, options); + return DeserializeEnvironmentType(document.RootElement, options); } - internal static DevCenterEnvironmentType DeserializeDevCenterEnvironmentType(JsonElement element, ModelReaderWriterOptions options = null) + internal static EnvironmentType DeserializeEnvironmentType(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -71,7 +71,7 @@ internal static DevCenterEnvironmentType DeserializeDevCenterEnvironmentType(Jso return null; } string name = default; - ResourceIdentifier deploymentTargetId = default; + string deploymentTargetId = default; EnvironmentTypeStatus status = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); @@ -84,7 +84,7 @@ internal static DevCenterEnvironmentType DeserializeDevCenterEnvironmentType(Jso } if (property.NameEquals("deploymentTargetId"u8)) { - deploymentTargetId = new ResourceIdentifier(property.Value.GetString()); + deploymentTargetId = property.Value.GetString(); continue; } if (property.NameEquals("status"u8)) @@ -98,46 +98,46 @@ internal static DevCenterEnvironmentType DeserializeDevCenterEnvironmentType(Jso } } serializedAdditionalRawData = rawDataDictionary; - return new DevCenterEnvironmentType(name, deploymentTargetId, status, serializedAdditionalRawData); + return new EnvironmentType(name, deploymentTargetId, status, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevCenterEnvironmentType)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(EnvironmentType)} does not support writing '{options.Format}' format."); } } - DevCenterEnvironmentType IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + EnvironmentType IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevCenterEnvironmentType(document.RootElement, options); + return DeserializeEnvironmentType(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevCenterEnvironmentType)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(EnvironmentType)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevCenterEnvironmentType FromResponse(Response response) + internal static EnvironmentType FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevCenterEnvironmentType(document.RootElement); + return DeserializeEnvironmentType(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironmentType.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/EnvironmentType.cs similarity index 79% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironmentType.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/EnvironmentType.cs index a9d9a7bb8d38a..e79fb143b8ef7 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterEnvironmentType.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/EnvironmentType.cs @@ -7,12 +7,11 @@ using System; using System.Collections.Generic; -using Azure.Core; namespace Azure.Developer.DevCenter.Models { /// Properties of an environment type. - public partial class DevCenterEnvironmentType + public partial class EnvironmentType { /// /// Keeps track of any properties unknown to the library. @@ -46,7 +45,7 @@ public partial class DevCenterEnvironmentType /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Name of the environment type. /// /// Id of a subscription or management group that the environment type will be @@ -55,7 +54,7 @@ public partial class DevCenterEnvironmentType /// /// Indicates whether this environment type is enabled for use in this project. /// or is null. - internal DevCenterEnvironmentType(string name, ResourceIdentifier deploymentTargetId, EnvironmentTypeStatus status) + internal EnvironmentType(string name, string deploymentTargetId, EnvironmentTypeStatus status) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(deploymentTargetId, nameof(deploymentTargetId)); @@ -65,7 +64,7 @@ internal DevCenterEnvironmentType(string name, ResourceIdentifier deploymentTarg Status = status; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Name of the environment type. /// /// Id of a subscription or management group that the environment type will be @@ -74,7 +73,7 @@ internal DevCenterEnvironmentType(string name, ResourceIdentifier deploymentTarg /// /// Indicates whether this environment type is enabled for use in this project. /// Keeps track of any properties unknown to the library. - internal DevCenterEnvironmentType(string name, ResourceIdentifier deploymentTargetId, EnvironmentTypeStatus status, IDictionary serializedAdditionalRawData) + internal EnvironmentType(string name, string deploymentTargetId, EnvironmentTypeStatus status, IDictionary serializedAdditionalRawData) { Name = name; DeploymentTargetId = deploymentTargetId; @@ -82,13 +81,19 @@ internal DevCenterEnvironmentType(string name, ResourceIdentifier deploymentTarg _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal DevCenterEnvironmentType() + /// Initializes a new instance of for deserialization. + internal EnvironmentType() { } /// Name of the environment type. public string Name { get; } + /// + /// Id of a subscription or management group that the environment type will be + /// mapped to. The environment's resources will be deployed into this subscription + /// or management group. + /// + public string DeploymentTargetId { get; } /// Indicates whether this environment type is enabled for use in this project. public EnvironmentTypeStatus Status { get; } } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxHardwareProfile.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/HardwareProfile.Serialization.cs similarity index 70% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxHardwareProfile.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/HardwareProfile.Serialization.cs index cc9f1469f91be..a17502c1c3e42 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxHardwareProfile.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/HardwareProfile.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevBoxHardwareProfile : IUtf8JsonSerializable, IJsonModel + public partial class HardwareProfile : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxHardwareProfile)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(HardwareProfile)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -59,19 +59,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteEndObject(); } - DevBoxHardwareProfile IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + HardwareProfile IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxHardwareProfile)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(HardwareProfile)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevBoxHardwareProfile(document.RootElement, options); + return DeserializeHardwareProfile(document.RootElement, options); } - internal static DevBoxHardwareProfile DeserializeDevBoxHardwareProfile(JsonElement element, ModelReaderWriterOptions options = null) + internal static HardwareProfile DeserializeHardwareProfile(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -119,46 +119,46 @@ internal static DevBoxHardwareProfile DeserializeDevBoxHardwareProfile(JsonEleme } } serializedAdditionalRawData = rawDataDictionary; - return new DevBoxHardwareProfile(skuName, vcpUs, memoryGB, serializedAdditionalRawData); + return new HardwareProfile(skuName, vcpUs, memoryGB, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevBoxHardwareProfile)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(HardwareProfile)} does not support writing '{options.Format}' format."); } } - DevBoxHardwareProfile IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + HardwareProfile IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevBoxHardwareProfile(document.RootElement, options); + return DeserializeHardwareProfile(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevBoxHardwareProfile)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(HardwareProfile)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevBoxHardwareProfile FromResponse(Response response) + internal static HardwareProfile FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevBoxHardwareProfile(document.RootElement); + return DeserializeHardwareProfile(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxHardwareProfile.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/HardwareProfile.cs similarity index 85% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxHardwareProfile.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/HardwareProfile.cs index e09e808a4e102..29923fa062d3f 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxHardwareProfile.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/HardwareProfile.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// Hardware specifications for the Dev Box. - public partial class DevBoxHardwareProfile + public partial class HardwareProfile { /// /// Keeps track of any properties unknown to the library. @@ -45,17 +45,17 @@ public partial class DevBoxHardwareProfile /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal DevBoxHardwareProfile() + /// Initializes a new instance of . + internal HardwareProfile() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The name of the SKU. /// The number of vCPUs available for the Dev Box. /// The amount of memory available for the Dev Box. /// Keeps track of any properties unknown to the library. - internal DevBoxHardwareProfile(SkuName? skuName, int? vcpUs, int? memoryGB, IDictionary serializedAdditionalRawData) + internal HardwareProfile(SkuName? skuName, int? vcpUs, int? memoryGB, IDictionary serializedAdditionalRawData) { SkuName = skuName; VCPUs = vcpUs; diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxImageReference.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/ImageReference.Serialization.cs similarity index 74% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxImageReference.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/ImageReference.Serialization.cs index 98271755058f0..65e5e672dbb60 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxImageReference.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/ImageReference.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevBoxImageReference : IUtf8JsonSerializable, IJsonModel + public partial class ImageReference : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxImageReference)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ImageReference)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -69,19 +69,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WriteEndObject(); } - DevBoxImageReference IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + ImageReference IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxImageReference)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ImageReference)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevBoxImageReference(document.RootElement, options); + return DeserializeImageReference(document.RootElement, options); } - internal static DevBoxImageReference DeserializeDevBoxImageReference(JsonElement element, ModelReaderWriterOptions options = null) + internal static ImageReference DeserializeImageReference(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -133,7 +133,7 @@ internal static DevBoxImageReference DeserializeDevBoxImageReference(JsonElement } } serializedAdditionalRawData = rawDataDictionary; - return new DevBoxImageReference( + return new ImageReference( name, version, operatingSystem, @@ -142,43 +142,43 @@ internal static DevBoxImageReference DeserializeDevBoxImageReference(JsonElement serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevBoxImageReference)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ImageReference)} does not support writing '{options.Format}' format."); } } - DevBoxImageReference IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + ImageReference IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevBoxImageReference(document.RootElement, options); + return DeserializeImageReference(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevBoxImageReference)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ImageReference)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevBoxImageReference FromResponse(Response response) + internal static ImageReference FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevBoxImageReference(document.RootElement); + return DeserializeImageReference(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxImageReference.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/ImageReference.cs similarity index 86% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxImageReference.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/ImageReference.cs index 596dcb3dce32c..60f94ad265a5a 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxImageReference.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/ImageReference.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// Specifies information about the image used. - public partial class DevBoxImageReference + public partial class ImageReference { /// /// Keeps track of any properties unknown to the library. @@ -45,19 +45,19 @@ public partial class DevBoxImageReference /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal DevBoxImageReference() + /// Initializes a new instance of . + internal ImageReference() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The name of the image used. /// The version of the image. /// The operating system of the image. /// The operating system build number of the image. /// The datetime that the backing image version was published. /// Keeps track of any properties unknown to the library. - internal DevBoxImageReference(string name, string version, string operatingSystem, string osBuildNumber, DateTimeOffset? publishedDate, IDictionary serializedAdditionalRawData) + internal ImageReference(string name, string version, string operatingSystem, string osBuildNumber, DateTimeOffset? publishedDate, IDictionary serializedAdditionalRawData) { Name = name; Version = version; diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.Serialization.cs index 5aba522369ea1..5c229ed34c7e9 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class OSDisk : IUtf8JsonSerializable, IJsonModel + public partial class OsDisk : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(OSDisk)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(OsDisk)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -49,19 +49,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions op writer.WriteEndObject(); } - OSDisk IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + OsDisk IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(OSDisk)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(OsDisk)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeOSDisk(document.RootElement, options); + return DeserializeOsDisk(document.RootElement, options); } - internal static OSDisk DeserializeOSDisk(JsonElement element, ModelReaderWriterOptions options = null) + internal static OsDisk DeserializeOsDisk(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -89,46 +89,46 @@ internal static OSDisk DeserializeOSDisk(JsonElement element, ModelReaderWriterO } } serializedAdditionalRawData = rawDataDictionary; - return new OSDisk(diskSizeGB, serializedAdditionalRawData); + return new OsDisk(diskSizeGB, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(OSDisk)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(OsDisk)} does not support writing '{options.Format}' format."); } } - OSDisk IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + OsDisk IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeOSDisk(document.RootElement, options); + return DeserializeOsDisk(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(OSDisk)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(OsDisk)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static OSDisk FromResponse(Response response) + internal static OsDisk FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeOSDisk(document.RootElement); + return DeserializeOsDisk(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.cs index 2f15b624a1676..8e10c4aab27b4 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/OSDisk.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// Settings for the operating system disk. - public partial class OSDisk + public partial class OsDisk { /// /// Keeps track of any properties unknown to the library. @@ -45,15 +45,15 @@ public partial class OSDisk /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal OSDisk() + /// Initializes a new instance of . + internal OsDisk() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The size of the OS Disk in gigabytes. /// Keeps track of any properties unknown to the library. - internal OSDisk(int? diskSizeGB, IDictionary serializedAdditionalRawData) + internal OsDisk(int? diskSizeGB, IDictionary serializedAdditionalRawData) { DiskSizeGB = diskSizeGB; _serializedAdditionalRawData = serializedAdditionalRawData; diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxPool.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Pool.Serialization.cs similarity index 79% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxPool.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Pool.Serialization.cs index 38fadfba7edc3..01801c1cb780f 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxPool.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Pool.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevBoxPool : IUtf8JsonSerializable, IJsonModel + public partial class Pool : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxPool)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Pool)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -88,19 +88,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteEndObject(); } - DevBoxPool IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Pool IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxPool)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Pool)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevBoxPool(document.RootElement, options); + return DeserializePool(document.RootElement, options); } - internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReaderWriterOptions options = null) + internal static Pool DeserializePool(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -111,10 +111,10 @@ internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReade string name = default; AzureLocation location = default; DevBoxOSType? osType = default; - DevBoxHardwareProfile hardwareProfile = default; + HardwareProfile hardwareProfile = default; HibernateSupport? hibernateSupport = default; - DevBoxStorageProfile storageProfile = default; - DevBoxImageReference imageReference = default; + StorageProfile storageProfile = default; + ImageReference imageReference = default; LocalAdministratorStatus? localAdministrator = default; StopOnDisconnectConfiguration stopOnDisconnect = default; PoolHealthStatus healthStatus = default; @@ -147,7 +147,7 @@ internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReade { continue; } - hardwareProfile = DevBoxHardwareProfile.DeserializeDevBoxHardwareProfile(property.Value, options); + hardwareProfile = HardwareProfile.DeserializeHardwareProfile(property.Value, options); continue; } if (property.NameEquals("hibernateSupport"u8)) @@ -165,7 +165,7 @@ internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReade { continue; } - storageProfile = DevBoxStorageProfile.DeserializeDevBoxStorageProfile(property.Value, options); + storageProfile = StorageProfile.DeserializeStorageProfile(property.Value, options); continue; } if (property.NameEquals("imageReference"u8)) @@ -174,7 +174,7 @@ internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReade { continue; } - imageReference = DevBoxImageReference.DeserializeDevBoxImageReference(property.Value, options); + imageReference = ImageReference.DeserializeImageReference(property.Value, options); continue; } if (property.NameEquals("localAdministrator"u8)) @@ -206,7 +206,7 @@ internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReade } } serializedAdditionalRawData = rawDataDictionary; - return new DevBoxPool( + return new Pool( name, location, osType, @@ -220,43 +220,43 @@ internal static DevBoxPool DeserializeDevBoxPool(JsonElement element, ModelReade serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevBoxPool)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Pool)} does not support writing '{options.Format}' format."); } } - DevBoxPool IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Pool IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevBoxPool(document.RootElement, options); + return DeserializePool(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevBoxPool)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Pool)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevBoxPool FromResponse(Response response) + internal static Pool FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevBoxPool(document.RootElement); + return DeserializePool(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxPool.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Pool.cs similarity index 83% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxPool.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Pool.cs index 49e7407f7889e..c503ee399861e 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxPool.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Pool.cs @@ -12,7 +12,7 @@ namespace Azure.Developer.DevCenter.Models { /// A pool of Dev Boxes. - public partial class DevBoxPool + public partial class Pool { /// /// Keeps track of any properties unknown to the library. @@ -46,19 +46,19 @@ public partial class DevBoxPool /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Azure region where Dev Boxes in the pool are located. /// /// Overall health status of the Pool. Indicates whether or not the Pool is /// available to create Dev Boxes. /// - internal DevBoxPool(AzureLocation location, PoolHealthStatus healthStatus) + internal Pool(AzureLocation location, PoolHealthStatus healthStatus) { Location = location; HealthStatus = healthStatus; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Pool name. /// Azure region where Dev Boxes in the pool are located. /// The operating system type of Dev Boxes in this pool. @@ -76,7 +76,7 @@ internal DevBoxPool(AzureLocation location, PoolHealthStatus healthStatus) /// available to create Dev Boxes. /// /// Keeps track of any properties unknown to the library. - internal DevBoxPool(string name, AzureLocation location, DevBoxOSType? osType, DevBoxHardwareProfile hardwareProfile, HibernateSupport? hibernateSupport, DevBoxStorageProfile storageProfile, DevBoxImageReference imageReference, LocalAdministratorStatus? localAdministratorStatus, StopOnDisconnectConfiguration stopOnDisconnect, PoolHealthStatus healthStatus, IDictionary serializedAdditionalRawData) + internal Pool(string name, AzureLocation location, DevBoxOSType? osType, HardwareProfile hardwareProfile, HibernateSupport? hibernateSupport, StorageProfile storageProfile, ImageReference imageReference, LocalAdministratorStatus? localAdministratorStatus, StopOnDisconnectConfiguration stopOnDisconnect, PoolHealthStatus healthStatus, IDictionary serializedAdditionalRawData) { Name = name; Location = location; @@ -91,8 +91,8 @@ internal DevBoxPool(string name, AzureLocation location, DevBoxOSType? osType, D _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal DevBoxPool() + /// Initializes a new instance of for deserialization. + internal Pool() { } @@ -103,13 +103,13 @@ internal DevBoxPool() /// The operating system type of Dev Boxes in this pool. public DevBoxOSType? OSType { get; } /// Hardware settings for the Dev Boxes created in this pool. - public DevBoxHardwareProfile HardwareProfile { get; } + public HardwareProfile HardwareProfile { get; } /// Indicates whether hibernate is enabled/disabled or unknown. public HibernateSupport? HibernateSupport { get; } /// Storage settings for Dev Box created in this pool. - public DevBoxStorageProfile StorageProfile { get; } + public StorageProfile StorageProfile { get; } /// Image settings for Dev Boxes create in this pool. - public DevBoxImageReference ImageReference { get; } + public ImageReference ImageReference { get; } /// /// Indicates whether owners of Dev Boxes in this pool are local administrators on /// the Dev Boxes. diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterProject.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Project.Serialization.cs similarity index 70% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterProject.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Project.Serialization.cs index 720b17604b198..0de0057708d42 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterProject.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Project.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevCenterProject : IUtf8JsonSerializable, IJsonModel + public partial class Project : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterProject)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Project)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -59,19 +59,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteEndObject(); } - DevCenterProject IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Project IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevCenterProject)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Project)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevCenterProject(document.RootElement, options); + return DeserializeProject(document.RootElement, options); } - internal static DevCenterProject DeserializeDevCenterProject(JsonElement element, ModelReaderWriterOptions options = null) + internal static Project DeserializeProject(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -111,46 +111,46 @@ internal static DevCenterProject DeserializeDevCenterProject(JsonElement element } } serializedAdditionalRawData = rawDataDictionary; - return new DevCenterProject(name, description, maxDevBoxesPerUser, serializedAdditionalRawData); + return new Project(name, description, maxDevBoxesPerUser, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevCenterProject)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Project)} does not support writing '{options.Format}' format."); } } - DevCenterProject IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Project IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevCenterProject(document.RootElement, options); + return DeserializeProject(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevCenterProject)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Project)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevCenterProject FromResponse(Response response) + internal static Project FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevCenterProject(document.RootElement); + return DeserializeProject(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterProject.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Project.cs similarity index 86% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterProject.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Project.cs index cc463de048dc2..f662587c606ae 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevCenterProject.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Project.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// Project details. - public partial class DevCenterProject + public partial class Project { /// /// Keeps track of any properties unknown to the library. @@ -45,12 +45,12 @@ public partial class DevCenterProject /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal DevCenterProject() + /// Initializes a new instance of . + internal Project() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Name of the project. /// Description of the project. /// @@ -58,7 +58,7 @@ internal DevCenterProject() /// create across all pools in the project. /// /// Keeps track of any properties unknown to the library. - internal DevCenterProject(string name, string description, int? maxDevBoxesPerUser, IDictionary serializedAdditionalRawData) + internal Project(string name, string description, int? maxDevBoxesPerUser, IDictionary serializedAdditionalRawData) { Name = name; Description = description; diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxSchedule.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Schedule.Serialization.cs similarity index 73% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxSchedule.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Schedule.Serialization.cs index f3d3d9ed7875e..8529ce0ffe552 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxSchedule.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Schedule.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevBoxSchedule : IUtf8JsonSerializable, IJsonModel + public partial class Schedule : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxSchedule)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Schedule)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -57,19 +57,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp writer.WriteEndObject(); } - DevBoxSchedule IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Schedule IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxSchedule)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Schedule)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevBoxSchedule(document.RootElement, options); + return DeserializeSchedule(document.RootElement, options); } - internal static DevBoxSchedule DeserializeDevBoxSchedule(JsonElement element, ModelReaderWriterOptions options = null) + internal static Schedule DeserializeSchedule(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -117,7 +117,7 @@ internal static DevBoxSchedule DeserializeDevBoxSchedule(JsonElement element, Mo } } serializedAdditionalRawData = rawDataDictionary; - return new DevBoxSchedule( + return new Schedule( name, type, frequency, @@ -126,43 +126,43 @@ internal static DevBoxSchedule DeserializeDevBoxSchedule(JsonElement element, Mo serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevBoxSchedule)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Schedule)} does not support writing '{options.Format}' format."); } } - DevBoxSchedule IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Schedule IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevBoxSchedule(document.RootElement, options); + return DeserializeSchedule(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevBoxSchedule)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Schedule)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevBoxSchedule FromResponse(Response response) + internal static Schedule FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevBoxSchedule(document.RootElement); + return DeserializeSchedule(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxSchedule.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Schedule.cs similarity index 85% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxSchedule.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Schedule.cs index 3faeeb889f707..20ff8052d02bd 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxSchedule.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/Schedule.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// A Schedule to execute action. - public partial class DevBoxSchedule + public partial class Schedule { /// /// Keeps track of any properties unknown to the library. @@ -45,13 +45,13 @@ public partial class DevBoxSchedule /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Supported type this scheduled task represents. /// The frequency of this scheduled task. /// The target time to trigger the action. The format is HH:MM. /// The IANA timezone id at which the schedule should execute. /// or is null. - internal DevBoxSchedule(ScheduleType scheduleType, ScheduleFrequency scheduleFrequency, string time, string timeZone) + internal Schedule(ScheduleType scheduleType, ScheduleFrequency scheduleFrequency, string time, string timeZone) { Argument.AssertNotNull(time, nameof(time)); Argument.AssertNotNull(timeZone, nameof(timeZone)); @@ -62,14 +62,14 @@ internal DevBoxSchedule(ScheduleType scheduleType, ScheduleFrequency scheduleFre TimeZone = timeZone; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Display name for the Schedule. /// Supported type this scheduled task represents. /// The frequency of this scheduled task. /// The target time to trigger the action. The format is HH:MM. /// The IANA timezone id at which the schedule should execute. /// Keeps track of any properties unknown to the library. - internal DevBoxSchedule(string name, ScheduleType scheduleType, ScheduleFrequency scheduleFrequency, string time, string timeZone, IDictionary serializedAdditionalRawData) + internal Schedule(string name, ScheduleType scheduleType, ScheduleFrequency scheduleFrequency, string time, string timeZone, IDictionary serializedAdditionalRawData) { Name = name; ScheduleType = scheduleType; @@ -79,8 +79,8 @@ internal DevBoxSchedule(string name, ScheduleType scheduleType, ScheduleFrequenc _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal DevBoxSchedule() + /// Initializes a new instance of for deserialization. + internal Schedule() { } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxStorageProfile.Serialization.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/StorageProfile.Serialization.cs similarity index 63% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxStorageProfile.Serialization.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/StorageProfile.Serialization.cs index 12ec22c9ee7cb..e25a1c5241e6b 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxStorageProfile.Serialization.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/StorageProfile.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Developer.DevCenter.Models { - public partial class DevBoxStorageProfile : IUtf8JsonSerializable, IJsonModel + public partial class StorageProfile : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxStorageProfile)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(StorageProfile)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -49,19 +49,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WriteEndObject(); } - DevBoxStorageProfile IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + StorageProfile IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(DevBoxStorageProfile)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(StorageProfile)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDevBoxStorageProfile(document.RootElement, options); + return DeserializeStorageProfile(document.RootElement, options); } - internal static DevBoxStorageProfile DeserializeDevBoxStorageProfile(JsonElement element, ModelReaderWriterOptions options = null) + internal static StorageProfile DeserializeStorageProfile(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -69,7 +69,7 @@ internal static DevBoxStorageProfile DeserializeDevBoxStorageProfile(JsonElement { return null; } - OSDisk osDisk = default; + OsDisk osDisk = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -80,7 +80,7 @@ internal static DevBoxStorageProfile DeserializeDevBoxStorageProfile(JsonElement { continue; } - osDisk = OSDisk.DeserializeOSDisk(property.Value, options); + osDisk = OsDisk.DeserializeOsDisk(property.Value, options); continue; } if (options.Format != "W") @@ -89,46 +89,46 @@ internal static DevBoxStorageProfile DeserializeDevBoxStorageProfile(JsonElement } } serializedAdditionalRawData = rawDataDictionary; - return new DevBoxStorageProfile(osDisk, serializedAdditionalRawData); + return new StorageProfile(osDisk, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(DevBoxStorageProfile)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(StorageProfile)} does not support writing '{options.Format}' format."); } } - DevBoxStorageProfile IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + StorageProfile IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeDevBoxStorageProfile(document.RootElement, options); + return DeserializeStorageProfile(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(DevBoxStorageProfile)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(StorageProfile)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static DevBoxStorageProfile FromResponse(Response response) + internal static StorageProfile FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeDevBoxStorageProfile(document.RootElement); + return DeserializeStorageProfile(document.RootElement); } /// Convert into a . diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxStorageProfile.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/StorageProfile.cs similarity index 82% rename from sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxStorageProfile.cs rename to sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/StorageProfile.cs index 241b2d6ba63d6..6ebca0fd5e6a4 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/DevBoxStorageProfile.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Models/StorageProfile.cs @@ -11,7 +11,7 @@ namespace Azure.Developer.DevCenter.Models { /// Storage settings for the Dev Box's disks. - public partial class DevBoxStorageProfile + public partial class StorageProfile { /// /// Keeps track of any properties unknown to the library. @@ -45,21 +45,21 @@ public partial class DevBoxStorageProfile /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal DevBoxStorageProfile() + /// Initializes a new instance of . + internal StorageProfile() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Settings for the operating system disk. /// Keeps track of any properties unknown to the library. - internal DevBoxStorageProfile(OSDisk osDisk, IDictionary serializedAdditionalRawData) + internal StorageProfile(OsDisk osDisk, IDictionary serializedAdditionalRawData) { OSDisk = osDisk; _serializedAdditionalRawData = serializedAdditionalRawData; } /// Settings for the operating system disk. - public OSDisk OSDisk { get; } + public OsDisk OSDisk { get; } } } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DeploymentEnvironmentsClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DeploymentEnvironmentsClient.cs index 6a10ecb302d2e..c2cc3f5026e34 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DeploymentEnvironmentsClient.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DeploymentEnvironmentsClient.cs @@ -59,7 +59,7 @@ public void Example_Environment_GetEnvironment_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = client.GetEnvironment("", "", ""); + Response response = client.GetEnvironment("", "", ""); } [Test] @@ -70,7 +70,7 @@ public async Task Example_Environment_GetEnvironment_ShortVersion_Convenience_As TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = await client.GetEnvironmentAsync("", "", ""); + Response response = await client.GetEnvironmentAsync("", "", ""); } [Test] @@ -131,7 +131,7 @@ public void Example_Environment_GetEnvironment_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = client.GetEnvironment("", "", ""); + Response response = client.GetEnvironment("", "", ""); } [Test] @@ -142,7 +142,7 @@ public async Task Example_Environment_GetEnvironment_AllParameters_Convenience_A TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = await client.GetEnvironmentAsync("", "", ""); + Response response = await client.GetEnvironmentAsync("", "", ""); } [Test] @@ -181,7 +181,7 @@ public void Example_Catalog_GetCatalog_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = client.GetCatalog("", ""); + Response response = client.GetCatalog("", ""); } [Test] @@ -192,7 +192,7 @@ public async Task Example_Catalog_GetCatalog_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = await client.GetCatalogAsync("", ""); + Response response = await client.GetCatalogAsync("", ""); } [Test] @@ -231,7 +231,7 @@ public void Example_Catalog_GetCatalog_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = client.GetCatalog("", ""); + Response response = client.GetCatalog("", ""); } [Test] @@ -242,7 +242,7 @@ public async Task Example_Catalog_GetCatalog_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - Response response = await client.GetCatalogAsync("", ""); + Response response = await client.GetCatalogAsync("", ""); } [Test] @@ -419,7 +419,7 @@ public void Example_EnvironmentClientOperations_GetAllEnvironments_ShortVersion_ TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterEnvironment item in client.GetAllEnvironments("")) + foreach (Models.Environment item in client.GetAllEnvironments("")) { } } @@ -432,7 +432,7 @@ public async Task Example_EnvironmentClientOperations_GetAllEnvironments_ShortVe TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterEnvironment item in client.GetAllEnvironmentsAsync("")) + await foreach (Models.Environment item in client.GetAllEnvironmentsAsync("")) { } } @@ -497,7 +497,7 @@ public void Example_EnvironmentClientOperations_GetAllEnvironments_AllParameters TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterEnvironment item in client.GetAllEnvironments("")) + foreach (Models.Environment item in client.GetAllEnvironments("")) { } } @@ -510,7 +510,7 @@ public async Task Example_EnvironmentClientOperations_GetAllEnvironments_AllPara TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterEnvironment item in client.GetAllEnvironmentsAsync("")) + await foreach (Models.Environment item in client.GetAllEnvironmentsAsync("")) { } } @@ -559,7 +559,7 @@ public void Example_EnvironmentClientOperations_GetEnvironments_ShortVersion_Con TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterEnvironment item in client.GetEnvironments("", "")) + foreach (Models.Environment item in client.GetEnvironments("", "")) { } } @@ -572,7 +572,7 @@ public async Task Example_EnvironmentClientOperations_GetEnvironments_ShortVersi TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterEnvironment item in client.GetEnvironmentsAsync("", "")) + await foreach (Models.Environment item in client.GetEnvironmentsAsync("", "")) { } } @@ -637,7 +637,7 @@ public void Example_EnvironmentClientOperations_GetEnvironments_AllParameters_Co TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterEnvironment item in client.GetEnvironments("", "")) + foreach (Models.Environment item in client.GetEnvironments("", "")) { } } @@ -650,7 +650,7 @@ public async Task Example_EnvironmentClientOperations_GetEnvironments_AllParamet TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterEnvironment item in client.GetEnvironmentsAsync("", "")) + await foreach (Models.Environment item in client.GetEnvironmentsAsync("", "")) { } } @@ -693,7 +693,7 @@ public void Example_Catalog_GetCatalogs_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterCatalog item in client.GetCatalogs("")) + foreach (Catalog item in client.GetCatalogs("")) { } } @@ -706,7 +706,7 @@ public async Task Example_Catalog_GetCatalogs_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterCatalog item in client.GetCatalogsAsync("")) + await foreach (Catalog item in client.GetCatalogsAsync("")) { } } @@ -749,7 +749,7 @@ public void Example_Catalog_GetCatalogs_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterCatalog item in client.GetCatalogs("")) + foreach (Catalog item in client.GetCatalogs("")) { } } @@ -762,7 +762,7 @@ public async Task Example_Catalog_GetCatalogs_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterCatalog item in client.GetCatalogsAsync("")) + await foreach (Catalog item in client.GetCatalogsAsync("")) { } } @@ -1093,7 +1093,7 @@ public void Example_EnvironmentClientOperations_GetEnvironmentTypes_ShortVersion TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypes("")) + foreach (EnvironmentType item in client.GetEnvironmentTypes("")) { } } @@ -1106,7 +1106,7 @@ public async Task Example_EnvironmentClientOperations_GetEnvironmentTypes_ShortV TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypesAsync("")) + await foreach (EnvironmentType item in client.GetEnvironmentTypesAsync("")) { } } @@ -1153,7 +1153,7 @@ public void Example_EnvironmentClientOperations_GetEnvironmentTypes_AllParameter TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypes("")) + foreach (EnvironmentType item in client.GetEnvironmentTypes("")) { } } @@ -1166,7 +1166,7 @@ public async Task Example_EnvironmentClientOperations_GetEnvironmentTypes_AllPar TokenCredential credential = new DefaultAzureCredential(); DeploymentEnvironmentsClient client = new DeploymentEnvironmentsClient(endpoint, credential); - await foreach (DevCenterEnvironmentType item in client.GetEnvironmentTypesAsync("")) + await foreach (EnvironmentType item in client.GetEnvironmentTypesAsync("")) { } } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs index e2014c863ea17..2663c71129e26 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs @@ -57,7 +57,7 @@ public void Example_Pool_GetPool_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = client.GetPool("", ""); + Response response = client.GetPool("", ""); } [Test] @@ -68,7 +68,7 @@ public async Task Example_Pool_GetPool_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = await client.GetPoolAsync("", ""); + Response response = await client.GetPoolAsync("", ""); } [Test] @@ -139,7 +139,7 @@ public void Example_Pool_GetPool_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = client.GetPool("", ""); + Response response = client.GetPool("", ""); } [Test] @@ -150,7 +150,7 @@ public async Task Example_Pool_GetPool_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = await client.GetPoolAsync("", ""); + Response response = await client.GetPoolAsync("", ""); } [Test] @@ -197,7 +197,7 @@ public void Example_Schedule_GetSchedule_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = client.GetSchedule("", "", ""); + Response response = client.GetSchedule("", "", ""); } [Test] @@ -208,7 +208,7 @@ public async Task Example_Schedule_GetSchedule_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = await client.GetScheduleAsync("", "", ""); + Response response = await client.GetScheduleAsync("", "", ""); } [Test] @@ -255,7 +255,7 @@ public void Example_Schedule_GetSchedule_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = client.GetSchedule("", "", ""); + Response response = client.GetSchedule("", "", ""); } [Test] @@ -266,7 +266,7 @@ public async Task Example_Schedule_GetSchedule_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - Response response = await client.GetScheduleAsync("", "", ""); + Response response = await client.GetScheduleAsync("", "", ""); } [Test] @@ -841,7 +841,7 @@ public void Example_Pool_GetPools_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - foreach (DevBoxPool item in client.GetPools("")) + foreach (Pool item in client.GetPools("")) { } } @@ -854,7 +854,7 @@ public async Task Example_Pool_GetPools_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - await foreach (DevBoxPool item in client.GetPoolsAsync("")) + await foreach (Pool item in client.GetPoolsAsync("")) { } } @@ -929,7 +929,7 @@ public void Example_Pool_GetPools_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - foreach (DevBoxPool item in client.GetPools("")) + foreach (Pool item in client.GetPools("")) { } } @@ -942,7 +942,7 @@ public async Task Example_Pool_GetPools_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - await foreach (DevBoxPool item in client.GetPoolsAsync("")) + await foreach (Pool item in client.GetPoolsAsync("")) { } } @@ -993,7 +993,7 @@ public void Example_Schedule_GetSchedules_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - foreach (DevBoxSchedule item in client.GetSchedules("", "")) + foreach (Schedule item in client.GetSchedules("", "")) { } } @@ -1006,7 +1006,7 @@ public async Task Example_Schedule_GetSchedules_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - await foreach (DevBoxSchedule item in client.GetSchedulesAsync("", "")) + await foreach (Schedule item in client.GetSchedulesAsync("", "")) { } } @@ -1057,7 +1057,7 @@ public void Example_Schedule_GetSchedules_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - foreach (DevBoxSchedule item in client.GetSchedules("", "")) + foreach (Schedule item in client.GetSchedules("", "")) { } } @@ -1070,7 +1070,7 @@ public async Task Example_Schedule_GetSchedules_AllParameters_Convenience_Async( TokenCredential credential = new DefaultAzureCredential(); DevBoxesClient client = new DevBoxesClient(endpoint, credential); - await foreach (DevBoxSchedule item in client.GetSchedulesAsync("", "")) + await foreach (Schedule item in client.GetSchedulesAsync("", "")) { } } diff --git a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs index aeff4fca9a000..cdc7e0bb7e576 100644 --- a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs +++ b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs @@ -53,7 +53,7 @@ public void Example_Project_GetProject_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - Response response = client.GetProject(""); + Response response = client.GetProject(""); } [Test] @@ -64,7 +64,7 @@ public async Task Example_Project_GetProject_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - Response response = await client.GetProjectAsync(""); + Response response = await client.GetProjectAsync(""); } [Test] @@ -107,7 +107,7 @@ public void Example_Project_GetProject_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - Response response = client.GetProject(""); + Response response = client.GetProject(""); } [Test] @@ -118,7 +118,7 @@ public async Task Example_Project_GetProject_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - Response response = await client.GetProjectAsync(""); + Response response = await client.GetProjectAsync(""); } [Test] @@ -159,7 +159,7 @@ public void Example_Project_GetProjects_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - foreach (DevCenterProject item in client.GetProjects()) + foreach (Project item in client.GetProjects()) { } } @@ -172,7 +172,7 @@ public async Task Example_Project_GetProjects_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - await foreach (DevCenterProject item in client.GetProjectsAsync()) + await foreach (Project item in client.GetProjectsAsync()) { } } @@ -219,7 +219,7 @@ public void Example_Project_GetProjects_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - foreach (DevCenterProject item in client.GetProjects()) + foreach (Project item in client.GetProjects()) { } } @@ -232,7 +232,7 @@ public async Task Example_Project_GetProjects_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); DevCenterClient client = new DevCenterClient(endpoint, credential); - await foreach (DevCenterProject item in client.GetProjectsAsync()) + await foreach (Project item in client.GetProjectsAsync()) { } } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentContent.Serialization.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentRequest.Serialization.cs similarity index 77% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentContent.Serialization.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentRequest.Serialization.cs index 6ed7fb7dbb60c..ea389d9d7bf83 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentContent.Serialization.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentRequest.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.DocumentIntelligence { - public partial class AnalyzeDocumentContent : IUtf8JsonSerializable, IJsonModel + public partial class AnalyzeDocumentRequest : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AnalyzeDocumentContent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(AnalyzeDocumentRequest)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -54,19 +54,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteEndObject(); } - AnalyzeDocumentContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + AnalyzeDocumentRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AnalyzeDocumentContent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(AnalyzeDocumentRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAnalyzeDocumentContent(document.RootElement, options); + return DeserializeAnalyzeDocumentRequest(document.RootElement, options); } - internal static AnalyzeDocumentContent DeserializeAnalyzeDocumentContent(JsonElement element, ModelReaderWriterOptions options = null) + internal static AnalyzeDocumentRequest DeserializeAnalyzeDocumentRequest(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -104,46 +104,46 @@ internal static AnalyzeDocumentContent DeserializeAnalyzeDocumentContent(JsonEle } } serializedAdditionalRawData = rawDataDictionary; - return new AnalyzeDocumentContent(urlSource, base64Source, serializedAdditionalRawData); + return new AnalyzeDocumentRequest(urlSource, base64Source, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(AnalyzeDocumentContent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(AnalyzeDocumentRequest)} does not support writing '{options.Format}' format."); } } - AnalyzeDocumentContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + AnalyzeDocumentRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeAnalyzeDocumentContent(document.RootElement, options); + return DeserializeAnalyzeDocumentRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(AnalyzeDocumentContent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(AnalyzeDocumentRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AnalyzeDocumentContent FromResponse(Response response) + internal static AnalyzeDocumentRequest FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeAnalyzeDocumentContent(document.RootElement); + return DeserializeAnalyzeDocumentRequest(document.RootElement); } /// Convert into a . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentContent.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentRequest.cs similarity index 93% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentContent.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentRequest.cs index 33d60f8cbb976..2fb8cc010667d 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentContent.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AnalyzeDocumentRequest.cs @@ -11,7 +11,7 @@ namespace Azure.AI.DocumentIntelligence { /// Document analysis parameters. - public partial class AnalyzeDocumentContent + public partial class AnalyzeDocumentRequest { /// /// Keeps track of any properties unknown to the library. @@ -45,19 +45,19 @@ public partial class AnalyzeDocumentContent /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public AnalyzeDocumentContent() + /// Initializes a new instance of . + public AnalyzeDocumentRequest() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Document URL to analyze. Either urlSource or base64Source must be specified. /// /// Base64 encoding of the document to analyze. Either urlSource or base64Source /// must be specified. /// /// Keeps track of any properties unknown to the library. - internal AnalyzeDocumentContent(Uri urlSource, BinaryData base64Source, IDictionary serializedAdditionalRawData) + internal AnalyzeDocumentRequest(Uri urlSource, BinaryData base64Source, IDictionary serializedAdditionalRawData) { UrlSource = urlSource; Base64Source = base64Source; diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyContent.Serialization.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyRequest.Serialization.cs similarity index 79% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyContent.Serialization.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyRequest.Serialization.cs index 26e2b54fc3f08..d9f9056aae08d 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyContent.Serialization.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyRequest.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.DocumentIntelligence { - public partial class AuthorizeCopyContent : IUtf8JsonSerializable, IJsonModel + public partial class AuthorizeCopyRequest : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AuthorizeCopyContent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(AuthorizeCopyRequest)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -62,19 +62,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WriteEndObject(); } - AuthorizeCopyContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + AuthorizeCopyRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AuthorizeCopyContent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(AuthorizeCopyRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAuthorizeCopyContent(document.RootElement, options); + return DeserializeAuthorizeCopyRequest(document.RootElement, options); } - internal static AuthorizeCopyContent DeserializeAuthorizeCopyContent(JsonElement element, ModelReaderWriterOptions options = null) + internal static AuthorizeCopyRequest DeserializeAuthorizeCopyRequest(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -119,46 +119,46 @@ internal static AuthorizeCopyContent DeserializeAuthorizeCopyContent(JsonElement } } serializedAdditionalRawData = rawDataDictionary; - return new AuthorizeCopyContent(modelId, description, tags ?? new ChangeTrackingDictionary(), serializedAdditionalRawData); + return new AuthorizeCopyRequest(modelId, description, tags ?? new ChangeTrackingDictionary(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(AuthorizeCopyContent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(AuthorizeCopyRequest)} does not support writing '{options.Format}' format."); } } - AuthorizeCopyContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + AuthorizeCopyRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeAuthorizeCopyContent(document.RootElement, options); + return DeserializeAuthorizeCopyRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(AuthorizeCopyContent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(AuthorizeCopyRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AuthorizeCopyContent FromResponse(Response response) + internal static AuthorizeCopyRequest FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeAuthorizeCopyContent(document.RootElement); + return DeserializeAuthorizeCopyRequest(document.RootElement); } /// Convert into a . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyContent.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyRequest.cs similarity index 90% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyContent.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyRequest.cs index 410192b66fd93..fdbd3def7b15f 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyContent.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/AuthorizeCopyRequest.cs @@ -11,7 +11,7 @@ namespace Azure.AI.DocumentIntelligence { /// Request body to authorize document model copy. - public partial class AuthorizeCopyContent + public partial class AuthorizeCopyRequest { /// /// Keeps track of any properties unknown to the library. @@ -45,10 +45,10 @@ public partial class AuthorizeCopyContent /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// is null. - public AuthorizeCopyContent(string modelId) + public AuthorizeCopyRequest(string modelId) { Argument.AssertNotNull(modelId, nameof(modelId)); @@ -56,12 +56,12 @@ public AuthorizeCopyContent(string modelId) Tags = new ChangeTrackingDictionary(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Document model description. /// List of key-value tag attributes associated with the document model. /// Keeps track of any properties unknown to the library. - internal AuthorizeCopyContent(string modelId, string description, IDictionary tags, IDictionary serializedAdditionalRawData) + internal AuthorizeCopyRequest(string modelId, string description, IDictionary tags, IDictionary serializedAdditionalRawData) { ModelId = modelId; Description = description; @@ -69,8 +69,8 @@ internal AuthorizeCopyContent(string modelId, string description, IDictionary Initializes a new instance of for deserialization. - internal AuthorizeCopyContent() + /// Initializes a new instance of for deserialization. + internal AuthorizeCopyRequest() { } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierContent.Serialization.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierRequest.Serialization.cs similarity index 79% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierContent.Serialization.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierRequest.Serialization.cs index 4a7819211a922..df43ba5ae3f9f 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierContent.Serialization.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierRequest.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.DocumentIntelligence { - public partial class BuildDocumentClassifierContent : IUtf8JsonSerializable, IJsonModel + public partial class BuildDocumentClassifierRequest : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(BuildDocumentClassifierContent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentClassifierRequest)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -64,19 +64,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod writer.WriteEndObject(); } - BuildDocumentClassifierContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + BuildDocumentClassifierRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(BuildDocumentClassifierContent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentClassifierRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeBuildDocumentClassifierContent(document.RootElement, options); + return DeserializeBuildDocumentClassifierRequest(document.RootElement, options); } - internal static BuildDocumentClassifierContent DeserializeBuildDocumentClassifierContent(JsonElement element, ModelReaderWriterOptions options = null) + internal static BuildDocumentClassifierRequest DeserializeBuildDocumentClassifierRequest(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -123,46 +123,46 @@ internal static BuildDocumentClassifierContent DeserializeBuildDocumentClassifie } } serializedAdditionalRawData = rawDataDictionary; - return new BuildDocumentClassifierContent(classifierId, description, baseClassifierId, docTypes, serializedAdditionalRawData); + return new BuildDocumentClassifierRequest(classifierId, description, baseClassifierId, docTypes, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(BuildDocumentClassifierContent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentClassifierRequest)} does not support writing '{options.Format}' format."); } } - BuildDocumentClassifierContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + BuildDocumentClassifierRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeBuildDocumentClassifierContent(document.RootElement, options); + return DeserializeBuildDocumentClassifierRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(BuildDocumentClassifierContent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentClassifierRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static BuildDocumentClassifierContent FromResponse(Response response) + internal static BuildDocumentClassifierRequest FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeBuildDocumentClassifierContent(document.RootElement); + return DeserializeBuildDocumentClassifierRequest(document.RootElement); } /// Convert into a . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierContent.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierRequest.cs similarity index 91% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierContent.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierRequest.cs index 22556b11658c2..76b90767193dd 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierContent.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentClassifierRequest.cs @@ -11,7 +11,7 @@ namespace Azure.AI.DocumentIntelligence { /// Request body to build a new custom document classifier. - public partial class BuildDocumentClassifierContent + public partial class BuildDocumentClassifierRequest { /// /// Keeps track of any properties unknown to the library. @@ -45,11 +45,11 @@ public partial class BuildDocumentClassifierContent /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document classifier name. /// List of document types to classify against. /// or is null. - public BuildDocumentClassifierContent(string classifierId, IDictionary docTypes) + public BuildDocumentClassifierRequest(string classifierId, IDictionary docTypes) { Argument.AssertNotNull(classifierId, nameof(classifierId)); Argument.AssertNotNull(docTypes, nameof(docTypes)); @@ -58,13 +58,13 @@ public BuildDocumentClassifierContent(string classifierId, IDictionary Initializes a new instance of . + /// Initializes a new instance of . /// Unique document classifier name. /// Document classifier description. /// Base classifierId on top of which to train the classifier. /// List of document types to classify against. /// Keeps track of any properties unknown to the library. - internal BuildDocumentClassifierContent(string classifierId, string description, string baseClassifierId, IDictionary docTypes, IDictionary serializedAdditionalRawData) + internal BuildDocumentClassifierRequest(string classifierId, string description, string baseClassifierId, IDictionary docTypes, IDictionary serializedAdditionalRawData) { ClassifierId = classifierId; Description = description; @@ -73,8 +73,8 @@ internal BuildDocumentClassifierContent(string classifierId, string description, _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal BuildDocumentClassifierContent() + /// Initializes a new instance of for deserialization. + internal BuildDocumentClassifierRequest() { } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelContent.Serialization.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelRequest.Serialization.cs similarity index 82% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelContent.Serialization.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelRequest.Serialization.cs index b651576acb6fa..acff4de55d8a6 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelContent.Serialization.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelRequest.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.DocumentIntelligence { - public partial class BuildDocumentModelContent : IUtf8JsonSerializable, IJsonModel + public partial class BuildDocumentModelRequest : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(BuildDocumentModelContent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentModelRequest)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -74,19 +74,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea writer.WriteEndObject(); } - BuildDocumentModelContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + BuildDocumentModelRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(BuildDocumentModelContent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentModelRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeBuildDocumentModelContent(document.RootElement, options); + return DeserializeBuildDocumentModelRequest(document.RootElement, options); } - internal static BuildDocumentModelContent DeserializeBuildDocumentModelContent(JsonElement element, ModelReaderWriterOptions options = null) + internal static BuildDocumentModelRequest DeserializeBuildDocumentModelRequest(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -157,7 +157,7 @@ internal static BuildDocumentModelContent DeserializeBuildDocumentModelContent(J } } serializedAdditionalRawData = rawDataDictionary; - return new BuildDocumentModelContent( + return new BuildDocumentModelRequest( modelId, description, buildMode, @@ -167,43 +167,43 @@ internal static BuildDocumentModelContent DeserializeBuildDocumentModelContent(J serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(BuildDocumentModelContent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentModelRequest)} does not support writing '{options.Format}' format."); } } - BuildDocumentModelContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + BuildDocumentModelRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeBuildDocumentModelContent(document.RootElement, options); + return DeserializeBuildDocumentModelRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(BuildDocumentModelContent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(BuildDocumentModelRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static BuildDocumentModelContent FromResponse(Response response) + internal static BuildDocumentModelRequest FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeBuildDocumentModelContent(document.RootElement); + return DeserializeBuildDocumentModelRequest(document.RootElement); } /// Convert into a . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelContent.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelRequest.cs similarity index 93% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelContent.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelRequest.cs index 0c06bb78af6ca..801e3a644b4db 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelContent.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/BuildDocumentModelRequest.cs @@ -11,7 +11,7 @@ namespace Azure.AI.DocumentIntelligence { /// Request body to build a new custom document model. - public partial class BuildDocumentModelContent + public partial class BuildDocumentModelRequest { /// /// Keeps track of any properties unknown to the library. @@ -45,11 +45,11 @@ public partial class BuildDocumentModelContent /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Custom document model build mode. /// is null. - public BuildDocumentModelContent(string modelId, DocumentBuildMode buildMode) + public BuildDocumentModelRequest(string modelId, DocumentBuildMode buildMode) { Argument.AssertNotNull(modelId, nameof(modelId)); @@ -58,7 +58,7 @@ public BuildDocumentModelContent(string modelId, DocumentBuildMode buildMode) Tags = new ChangeTrackingDictionary(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Document model description. /// Custom document model build mode. @@ -72,7 +72,7 @@ public BuildDocumentModelContent(string modelId, DocumentBuildMode buildMode) /// /// List of key-value tag attributes associated with the document model. /// Keeps track of any properties unknown to the library. - internal BuildDocumentModelContent(string modelId, string description, DocumentBuildMode buildMode, AzureBlobContentSource azureBlobSource, AzureBlobFileListContentSource azureBlobFileListSource, IDictionary tags, IDictionary serializedAdditionalRawData) + internal BuildDocumentModelRequest(string modelId, string description, DocumentBuildMode buildMode, AzureBlobContentSource azureBlobSource, AzureBlobFileListContentSource azureBlobFileListSource, IDictionary tags, IDictionary serializedAdditionalRawData) { ModelId = modelId; Description = description; @@ -83,8 +83,8 @@ internal BuildDocumentModelContent(string modelId, string description, DocumentB _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal BuildDocumentModelContent() + /// Initializes a new instance of for deserialization. + internal BuildDocumentModelRequest() { } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentContent.Serialization.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentRequest.Serialization.cs similarity index 76% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentContent.Serialization.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentRequest.Serialization.cs index dbbf69611874a..893cf64e6c466 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentContent.Serialization.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentRequest.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.DocumentIntelligence { - public partial class ClassifyDocumentContent : IUtf8JsonSerializable, IJsonModel + public partial class ClassifyDocumentRequest : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(ClassifyDocumentContent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ClassifyDocumentRequest)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -54,19 +54,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade writer.WriteEndObject(); } - ClassifyDocumentContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + ClassifyDocumentRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(ClassifyDocumentContent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ClassifyDocumentRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeClassifyDocumentContent(document.RootElement, options); + return DeserializeClassifyDocumentRequest(document.RootElement, options); } - internal static ClassifyDocumentContent DeserializeClassifyDocumentContent(JsonElement element, ModelReaderWriterOptions options = null) + internal static ClassifyDocumentRequest DeserializeClassifyDocumentRequest(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -104,46 +104,46 @@ internal static ClassifyDocumentContent DeserializeClassifyDocumentContent(JsonE } } serializedAdditionalRawData = rawDataDictionary; - return new ClassifyDocumentContent(urlSource, base64Source, serializedAdditionalRawData); + return new ClassifyDocumentRequest(urlSource, base64Source, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(ClassifyDocumentContent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ClassifyDocumentRequest)} does not support writing '{options.Format}' format."); } } - ClassifyDocumentContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + ClassifyDocumentRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeClassifyDocumentContent(document.RootElement, options); + return DeserializeClassifyDocumentRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(ClassifyDocumentContent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ClassifyDocumentRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static ClassifyDocumentContent FromResponse(Response response) + internal static ClassifyDocumentRequest FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeClassifyDocumentContent(document.RootElement); + return DeserializeClassifyDocumentRequest(document.RootElement); } /// Convert into a . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentContent.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentRequest.cs similarity index 93% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentContent.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentRequest.cs index 3ba46a568ff95..69d9c64a3b7fd 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentContent.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ClassifyDocumentRequest.cs @@ -11,7 +11,7 @@ namespace Azure.AI.DocumentIntelligence { /// Document classification parameters. - public partial class ClassifyDocumentContent + public partial class ClassifyDocumentRequest { /// /// Keeps track of any properties unknown to the library. @@ -45,19 +45,19 @@ public partial class ClassifyDocumentContent /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public ClassifyDocumentContent() + /// Initializes a new instance of . + public ClassifyDocumentRequest() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Document URL to classify. Either urlSource or base64Source must be specified. /// /// Base64 encoding of the document to classify. Either urlSource or base64Source /// must be specified. /// /// Keeps track of any properties unknown to the library. - internal ClassifyDocumentContent(Uri urlSource, BinaryData base64Source, IDictionary serializedAdditionalRawData) + internal ClassifyDocumentRequest(Uri urlSource, BinaryData base64Source, IDictionary serializedAdditionalRawData) { UrlSource = urlSource; Base64Source = base64Source; diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelContent.Serialization.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelRequest.Serialization.cs similarity index 80% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelContent.Serialization.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelRequest.Serialization.cs index d90b796d387d0..b416e41154b4b 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelContent.Serialization.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelRequest.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.DocumentIntelligence { - public partial class ComposeDocumentModelContent : IUtf8JsonSerializable, IJsonModel + public partial class ComposeDocumentModelRequest : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(ComposeDocumentModelContent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ComposeDocumentModelRequest)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -69,19 +69,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR writer.WriteEndObject(); } - ComposeDocumentModelContent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + ComposeDocumentModelRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(ComposeDocumentModelContent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ComposeDocumentModelRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeComposeDocumentModelContent(document.RootElement, options); + return DeserializeComposeDocumentModelRequest(document.RootElement, options); } - internal static ComposeDocumentModelContent DeserializeComposeDocumentModelContent(JsonElement element, ModelReaderWriterOptions options = null) + internal static ComposeDocumentModelRequest DeserializeComposeDocumentModelRequest(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -137,46 +137,46 @@ internal static ComposeDocumentModelContent DeserializeComposeDocumentModelConte } } serializedAdditionalRawData = rawDataDictionary; - return new ComposeDocumentModelContent(modelId, description, componentModels, tags ?? new ChangeTrackingDictionary(), serializedAdditionalRawData); + return new ComposeDocumentModelRequest(modelId, description, componentModels, tags ?? new ChangeTrackingDictionary(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(ComposeDocumentModelContent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ComposeDocumentModelRequest)} does not support writing '{options.Format}' format."); } } - ComposeDocumentModelContent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + ComposeDocumentModelRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeComposeDocumentModelContent(document.RootElement, options); + return DeserializeComposeDocumentModelRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(ComposeDocumentModelContent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ComposeDocumentModelRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static ComposeDocumentModelContent FromResponse(Response response) + internal static ComposeDocumentModelRequest FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeComposeDocumentModelContent(document.RootElement); + return DeserializeComposeDocumentModelRequest(document.RootElement); } /// Convert into a . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelContent.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelRequest.cs similarity index 91% rename from sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelContent.cs rename to sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelRequest.cs index 3a96cbc23fccc..bd733a48c0426 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelContent.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/ComposeDocumentModelRequest.cs @@ -12,7 +12,7 @@ namespace Azure.AI.DocumentIntelligence { /// Request body to create a composed document model from component document models. - public partial class ComposeDocumentModelContent + public partial class ComposeDocumentModelRequest { /// /// Keeps track of any properties unknown to the library. @@ -46,11 +46,11 @@ public partial class ComposeDocumentModelContent /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// List of component document models to compose. /// or is null. - public ComposeDocumentModelContent(string modelId, IEnumerable componentModels) + public ComposeDocumentModelRequest(string modelId, IEnumerable componentModels) { Argument.AssertNotNull(modelId, nameof(modelId)); Argument.AssertNotNull(componentModels, nameof(componentModels)); @@ -60,13 +60,13 @@ public ComposeDocumentModelContent(string modelId, IEnumerable(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Document model description. /// List of component document models to compose. /// List of key-value tag attributes associated with the document model. /// Keeps track of any properties unknown to the library. - internal ComposeDocumentModelContent(string modelId, string description, IList componentModels, IDictionary tags, IDictionary serializedAdditionalRawData) + internal ComposeDocumentModelRequest(string modelId, string description, IList componentModels, IDictionary tags, IDictionary serializedAdditionalRawData) { ModelId = modelId; Description = description; @@ -75,8 +75,8 @@ internal ComposeDocumentModelContent(string modelId, string description, IList Initializes a new instance of for deserialization. - internal ComposeDocumentModelContent() + /// Initializes a new instance of for deserialization. + internal ComposeDocumentModelRequest() { } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceAdministrationClient.xml b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceAdministrationClient.xml index fa53d8b7c08cf..c679a3cb5a29b 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceAdministrationClient.xml +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceAdministrationClient.xml @@ -1,7 +1,7 @@ - + This sample shows how to call AuthorizeModelCopyAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent(""); +AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest(""); Response response = await client.AuthorizeModelCopyAsync(authorizeCopyRequest); ]]> This sample shows how to call AuthorizeModelCopyAsync with all parameters. @@ -18,7 +18,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent("") +AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest("") { Description = "", Tags = @@ -29,7 +29,7 @@ AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent("" Response response = await client.AuthorizeModelCopyAsync(authorizeCopyRequest); ]]> - + This sample shows how to call AuthorizeModelCopy. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent(""); +AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest(""); Response response = client.AuthorizeModelCopy(authorizeCopyRequest); ]]> This sample shows how to call AuthorizeModelCopy with all parameters. @@ -46,7 +46,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent("") +AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest("") { Description = "", Tags = @@ -1141,7 +1141,7 @@ foreach (BinaryData item in client.GetClassifiers(null)) } ]]> - + This sample shows how to call BuildDocumentModelAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template); +BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template); Operation operation = await client.BuildDocumentModelAsync(WaitUntil.Completed, buildRequest); DocumentModelDetails responseData = operation.Value; ]]> @@ -1159,7 +1159,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template) +BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template) { Description = "", AzureBlobSource = new AzureBlobContentSource(new Uri("http://localhost:3000")) @@ -1176,7 +1176,7 @@ Operation operation = await client.BuildDocumentModelAsync DocumentModelDetails responseData = operation.Value; ]]> - + This sample shows how to call BuildDocumentModel. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template); +BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template); Operation operation = client.BuildDocumentModel(WaitUntil.Completed, buildRequest); DocumentModelDetails responseData = operation.Value; ]]> @@ -1194,7 +1194,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template) +BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template) { Description = "", AzureBlobSource = new AzureBlobContentSource(new Uri("http://localhost:3000")) @@ -1361,7 +1361,7 @@ Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("message").ToStr Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("target").ToString()); ]]> - + This sample shows how to call ComposeModelAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] +ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }); @@ -1382,7 +1382,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] +ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }) @@ -1397,7 +1397,7 @@ Operation operation = await client.ComposeModelAsync(WaitU DocumentModelDetails responseData = operation.Value; ]]> - + This sample shows how to call ComposeModel. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] +ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }); @@ -1418,7 +1418,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] +ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }) @@ -1793,7 +1793,7 @@ Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("message").ToStr Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("target").ToString()); ]]> - + This sample shows how to call BuildClassifierAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary +BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails() }); @@ -1814,7 +1814,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary +BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails { @@ -1834,7 +1834,7 @@ Operation operation = await client.BuildClassifierAsy DocumentClassifierDetails responseData = operation.Value; ]]> - + This sample shows how to call BuildClassifier. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary +BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails() }); @@ -1855,7 +1855,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); -BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary +BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails { diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceClient.xml b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceClient.xml index 5214bcdec8244..84d5fdf43113a 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceClient.xml +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/Docs/DocumentIntelligenceClient.xml @@ -1,7 +1,7 @@ - + This sample shows how to call AnalyzeDocumentAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); -AnalyzeDocumentContent analyzeRequest = new AnalyzeDocumentContent +AnalyzeDocumentRequest analyzeRequest = new AnalyzeDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), @@ -27,7 +27,7 @@ Operation operation = await client.AnalyzeDocumentAsync(WaitUntil AnalyzeResult responseData = operation.Value; ]]> - + This sample shows how to call AnalyzeDocument. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); -AnalyzeDocumentContent analyzeRequest = new AnalyzeDocumentContent +AnalyzeDocumentRequest analyzeRequest = new AnalyzeDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), @@ -533,7 +533,7 @@ Console.WriteLine(result.GetProperty("documents")[0].GetProperty("fields").GetPr Console.WriteLine(result.GetProperty("documents")[0].GetProperty("confidence").ToString()); ]]> - + This sample shows how to call ClassifyDocumentAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); -ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent(); +ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest(); Operation operation = await client.ClassifyDocumentAsync(WaitUntil.Completed, "", classifyRequest); AnalyzeResult responseData = operation.Value; ]]> @@ -551,7 +551,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); -ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent +ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), @@ -560,7 +560,7 @@ Operation operation = await client.ClassifyDocumentAsync(WaitUnti AnalyzeResult responseData = operation.Value; ]]> - + This sample shows how to call ClassifyDocument. "); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); -ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent(); +ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest(); Operation operation = client.ClassifyDocument(WaitUntil.Completed, "", classifyRequest); AnalyzeResult responseData = operation.Value; ]]> @@ -578,7 +578,7 @@ Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); -ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent +ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceAdministrationClient.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceAdministrationClient.cs index d59efed82a424..ef55b1b5c2180 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceAdministrationClient.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceAdministrationClient.cs @@ -97,8 +97,8 @@ public DocumentIntelligenceAdministrationClient(Uri endpoint, TokenCredential cr /// Authorize copy request parameters. /// The cancellation token to use. /// is null. - /// - public virtual async Task> AuthorizeModelCopyAsync(AuthorizeCopyContent authorizeCopyRequest, CancellationToken cancellationToken = default) + /// + public virtual async Task> AuthorizeModelCopyAsync(AuthorizeCopyRequest authorizeCopyRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(authorizeCopyRequest, nameof(authorizeCopyRequest)); @@ -115,8 +115,8 @@ public virtual async Task> AuthorizeModelCopyAsync(A /// Authorize copy request parameters. /// The cancellation token to use. /// is null. - /// - public virtual Response AuthorizeModelCopy(AuthorizeCopyContent authorizeCopyRequest, CancellationToken cancellationToken = default) + /// + public virtual Response AuthorizeModelCopy(AuthorizeCopyRequest authorizeCopyRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(authorizeCopyRequest, nameof(authorizeCopyRequest)); @@ -137,7 +137,7 @@ public virtual Response AuthorizeModelCopy(AuthorizeCopyConte /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -177,7 +177,7 @@ public virtual async Task AuthorizeModelCopyAsync(RequestContent conte /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -997,8 +997,8 @@ public virtual Pageable GetClassifiers(RequestContext context) /// Build request parameters. /// The cancellation token to use. /// is null. - /// - public virtual async Task> BuildDocumentModelAsync(WaitUntil waitUntil, BuildDocumentModelContent buildRequest, CancellationToken cancellationToken = default) + /// + public virtual async Task> BuildDocumentModelAsync(WaitUntil waitUntil, BuildDocumentModelRequest buildRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(buildRequest, nameof(buildRequest)); @@ -1013,8 +1013,8 @@ public virtual async Task> BuildDocumentModelAsy /// Build request parameters. /// The cancellation token to use. /// is null. - /// - public virtual Operation BuildDocumentModel(WaitUntil waitUntil, BuildDocumentModelContent buildRequest, CancellationToken cancellationToken = default) + /// + public virtual Operation BuildDocumentModel(WaitUntil waitUntil, BuildDocumentModelRequest buildRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(buildRequest, nameof(buildRequest)); @@ -1029,8 +1029,8 @@ public virtual Operation BuildDocumentModel(WaitUntil wait /// Compose request parameters. /// The cancellation token to use. /// is null. - /// - public virtual async Task> ComposeModelAsync(WaitUntil waitUntil, ComposeDocumentModelContent composeRequest, CancellationToken cancellationToken = default) + /// + public virtual async Task> ComposeModelAsync(WaitUntil waitUntil, ComposeDocumentModelRequest composeRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(composeRequest, nameof(composeRequest)); @@ -1045,8 +1045,8 @@ public virtual async Task> ComposeModelAsync(Wai /// Compose request parameters. /// The cancellation token to use. /// is null. - /// - public virtual Operation ComposeModel(WaitUntil waitUntil, ComposeDocumentModelContent composeRequest, CancellationToken cancellationToken = default) + /// + public virtual Operation ComposeModel(WaitUntil waitUntil, ComposeDocumentModelRequest composeRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(composeRequest, nameof(composeRequest)); @@ -1099,8 +1099,8 @@ public virtual Operation CopyModelTo(WaitUntil waitUntil, /// Build request parameters. /// The cancellation token to use. /// is null. - /// - public virtual async Task> BuildClassifierAsync(WaitUntil waitUntil, BuildDocumentClassifierContent buildRequest, CancellationToken cancellationToken = default) + /// + public virtual async Task> BuildClassifierAsync(WaitUntil waitUntil, BuildDocumentClassifierRequest buildRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(buildRequest, nameof(buildRequest)); @@ -1115,8 +1115,8 @@ public virtual async Task> BuildClassifierA /// Build request parameters. /// The cancellation token to use. /// is null. - /// - public virtual Operation BuildClassifier(WaitUntil waitUntil, BuildDocumentClassifierContent buildRequest, CancellationToken cancellationToken = default) + /// + public virtual Operation BuildClassifier(WaitUntil waitUntil, BuildDocumentClassifierRequest buildRequest, CancellationToken cancellationToken = default) { Argument.AssertNotNull(buildRequest, nameof(buildRequest)); diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceClient.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceClient.cs index 379f54b9c4ac5..7fc0d6f4c2b11 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceClient.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceClient.cs @@ -106,8 +106,8 @@ public DocumentIntelligenceClient(Uri endpoint, TokenCredential credential, Docu /// The cancellation token to use. /// is null. /// is an empty string, and was expected to be non-empty. - /// - public virtual async Task> AnalyzeDocumentAsync(WaitUntil waitUntil, string modelId, AnalyzeDocumentContent analyzeRequest = null, string pages = null, string locale = null, StringIndexType? stringIndexType = null, IEnumerable features = null, IEnumerable queryFields = null, ContentFormat? outputContentFormat = null, CancellationToken cancellationToken = default) + /// + public virtual async Task> AnalyzeDocumentAsync(WaitUntil waitUntil, string modelId, AnalyzeDocumentRequest analyzeRequest = null, string pages = null, string locale = null, StringIndexType? stringIndexType = null, IEnumerable features = null, IEnumerable queryFields = null, ContentFormat? outputContentFormat = null, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(modelId, nameof(modelId)); @@ -133,8 +133,8 @@ public virtual async Task> AnalyzeDocumentAsync(WaitUnt /// The cancellation token to use. /// is null. /// is an empty string, and was expected to be non-empty. - /// - public virtual Operation AnalyzeDocument(WaitUntil waitUntil, string modelId, AnalyzeDocumentContent analyzeRequest = null, string pages = null, string locale = null, StringIndexType? stringIndexType = null, IEnumerable features = null, IEnumerable queryFields = null, ContentFormat? outputContentFormat = null, CancellationToken cancellationToken = default) + /// + public virtual Operation AnalyzeDocument(WaitUntil waitUntil, string modelId, AnalyzeDocumentRequest analyzeRequest = null, string pages = null, string locale = null, StringIndexType? stringIndexType = null, IEnumerable features = null, IEnumerable queryFields = null, ContentFormat? outputContentFormat = null, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(modelId, nameof(modelId)); @@ -154,7 +154,7 @@ public virtual Operation AnalyzeDocument(WaitUntil waitUntil, str /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -205,7 +205,7 @@ public virtual async Task> AnalyzeDocumentAsync(WaitUntil /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -255,8 +255,8 @@ public virtual Operation AnalyzeDocument(WaitUntil waitUntil, string /// The cancellation token to use. /// or is null. /// is an empty string, and was expected to be non-empty. - /// - public virtual async Task> ClassifyDocumentAsync(WaitUntil waitUntil, string classifierId, ClassifyDocumentContent classifyRequest, StringIndexType? stringIndexType = null, SplitMode? split = null, CancellationToken cancellationToken = default) + /// + public virtual async Task> ClassifyDocumentAsync(WaitUntil waitUntil, string classifierId, ClassifyDocumentRequest classifyRequest, StringIndexType? stringIndexType = null, SplitMode? split = null, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(classifierId, nameof(classifierId)); Argument.AssertNotNull(classifyRequest, nameof(classifyRequest)); @@ -276,8 +276,8 @@ public virtual async Task> ClassifyDocumentAsync(WaitUn /// The cancellation token to use. /// or is null. /// is an empty string, and was expected to be non-empty. - /// - public virtual Operation ClassifyDocument(WaitUntil waitUntil, string classifierId, ClassifyDocumentContent classifyRequest, StringIndexType? stringIndexType = null, SplitMode? split = null, CancellationToken cancellationToken = default) + /// + public virtual Operation ClassifyDocument(WaitUntil waitUntil, string classifierId, ClassifyDocumentRequest classifyRequest, StringIndexType? stringIndexType = null, SplitMode? split = null, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(classifierId, nameof(classifierId)); Argument.AssertNotNull(classifyRequest, nameof(classifyRequest)); @@ -298,7 +298,7 @@ public virtual Operation ClassifyDocument(WaitUntil waitUntil, st /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -343,7 +343,7 @@ public virtual async Task> ClassifyDocumentAsync(WaitUntil /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceModelFactory.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceModelFactory.cs index 514ffabc51ae8..0593d0dc500bb 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceModelFactory.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/src/Generated/DocumentIntelligenceModelFactory.cs @@ -636,7 +636,7 @@ public static AddressValue AddressValue(string houseNumber = null, string poBox serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Document model description. /// Custom document model build mode. @@ -649,12 +649,12 @@ public static AddressValue AddressValue(string houseNumber = null, string poBox /// azureBlobSource or azureBlobFileListSource must be specified. /// /// List of key-value tag attributes associated with the document model. - /// A new instance for mocking. - public static BuildDocumentModelContent BuildDocumentModelContent(string modelId = null, string description = null, DocumentBuildMode buildMode = default, AzureBlobContentSource azureBlobSource = null, AzureBlobFileListContentSource azureBlobFileListSource = null, IDictionary tags = null) + /// A new instance for mocking. + public static BuildDocumentModelRequest BuildDocumentModelRequest(string modelId = null, string description = null, DocumentBuildMode buildMode = default, AzureBlobContentSource azureBlobSource = null, AzureBlobFileListContentSource azureBlobFileListSource = null, IDictionary tags = null) { tags ??= new Dictionary(); - return new BuildDocumentModelContent( + return new BuildDocumentModelRequest( modelId, description, buildMode, @@ -809,18 +809,18 @@ public static DocumentIntelligenceWarning DocumentIntelligenceWarning(string cod return new DocumentIntelligenceWarning(code, message, target, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Document model description. /// List of component document models to compose. /// List of key-value tag attributes associated with the document model. - /// A new instance for mocking. - public static ComposeDocumentModelContent ComposeDocumentModelContent(string modelId = null, string description = null, IEnumerable componentModels = null, IDictionary tags = null) + /// A new instance for mocking. + public static ComposeDocumentModelRequest ComposeDocumentModelRequest(string modelId = null, string description = null, IEnumerable componentModels = null, IDictionary tags = null) { componentModels ??= new List(); tags ??= new Dictionary(); - return new ComposeDocumentModelContent(modelId, description, componentModels?.ToList(), tags, serializedAdditionalRawData: null); + return new ComposeDocumentModelRequest(modelId, description, componentModels?.ToList(), tags, serializedAdditionalRawData: null); } /// Initializes a new instance of . @@ -854,16 +854,16 @@ public static DocumentModelComposeOperationDetails DocumentModelComposeOperation result); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document model name. /// Document model description. /// List of key-value tag attributes associated with the document model. - /// A new instance for mocking. - public static AuthorizeCopyContent AuthorizeCopyContent(string modelId = null, string description = null, IDictionary tags = null) + /// A new instance for mocking. + public static AuthorizeCopyRequest AuthorizeCopyRequest(string modelId = null, string description = null, IDictionary tags = null) { tags ??= new Dictionary(); - return new AuthorizeCopyContent(modelId, description, tags, serializedAdditionalRawData: null); + return new AuthorizeCopyRequest(modelId, description, tags, serializedAdditionalRawData: null); } /// Initializes a new instance of . @@ -925,17 +925,17 @@ public static QuotaDetails QuotaDetails(int used = default, int quota = default, return new QuotaDetails(used, quota, quotaResetsOn, serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique document classifier name. /// Document classifier description. /// Base classifierId on top of which to train the classifier. /// List of document types to classify against. - /// A new instance for mocking. - public static BuildDocumentClassifierContent BuildDocumentClassifierContent(string classifierId = null, string description = null, string baseClassifierId = null, IDictionary docTypes = null) + /// A new instance for mocking. + public static BuildDocumentClassifierRequest BuildDocumentClassifierRequest(string classifierId = null, string description = null, string baseClassifierId = null, IDictionary docTypes = null) { docTypes ??= new Dictionary(); - return new BuildDocumentClassifierContent(classifierId, description, baseClassifierId, docTypes, serializedAdditionalRawData: null); + return new BuildDocumentClassifierRequest(classifierId, description, baseClassifierId, docTypes, serializedAdditionalRawData: null); } /// Initializes a new instance of . diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceAdministrationClient.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceAdministrationClient.cs index 443ed89962659..1c3d7dd256c2b 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceAdministrationClient.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceAdministrationClient.cs @@ -71,7 +71,7 @@ public void Example_DocumentIntelligenceAdministrationClient_AuthorizeModelCopy_ AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent(""); + AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest(""); Response response = client.AuthorizeModelCopy(authorizeCopyRequest); } @@ -83,7 +83,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_AuthorizeMode AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent(""); + AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest(""); Response response = await client.AuthorizeModelCopyAsync(authorizeCopyRequest); } @@ -151,7 +151,7 @@ public void Example_DocumentIntelligenceAdministrationClient_AuthorizeModelCopy_ AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent("") + AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest("") { Description = "", Tags = @@ -170,7 +170,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_AuthorizeMode AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - AuthorizeCopyContent authorizeCopyRequest = new AuthorizeCopyContent("") + AuthorizeCopyRequest authorizeCopyRequest = new AuthorizeCopyRequest("") { Description = "", Tags = @@ -1315,7 +1315,7 @@ public void Example_DocumentIntelligenceAdministrationClient_BuildDocumentModel_ AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template); + BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template); Operation operation = client.BuildDocumentModel(WaitUntil.Completed, buildRequest); DocumentModelDetails responseData = operation.Value; } @@ -1328,7 +1328,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_BuildDocument AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template); + BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template); Operation operation = await client.BuildDocumentModelAsync(WaitUntil.Completed, buildRequest); DocumentModelDetails responseData = operation.Value; } @@ -1455,7 +1455,7 @@ public void Example_DocumentIntelligenceAdministrationClient_BuildDocumentModel_ AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template) + BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template) { Description = "", AzureBlobSource = new AzureBlobContentSource(new Uri("http://localhost:3000")) @@ -1480,7 +1480,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_BuildDocument AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentModelContent buildRequest = new BuildDocumentModelContent("", DocumentBuildMode.Template) + BuildDocumentModelRequest buildRequest = new BuildDocumentModelRequest("", DocumentBuildMode.Template) { Description = "", AzureBlobSource = new AzureBlobContentSource(new Uri("http://localhost:3000")) @@ -1559,7 +1559,7 @@ public void Example_DocumentIntelligenceAdministrationClient_ComposeModel_ShortV AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] + ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }); @@ -1575,7 +1575,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_ComposeModel_ AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] + ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }); @@ -1697,7 +1697,7 @@ public void Example_DocumentIntelligenceAdministrationClient_ComposeModel_AllPar AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] + ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }) @@ -1720,7 +1720,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_ComposeModel_ AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - ComposeDocumentModelContent composeRequest = new ComposeDocumentModelContent("", new ComponentDocumentModelDetails[] + ComposeDocumentModelRequest composeRequest = new ComposeDocumentModelRequest("", new ComponentDocumentModelDetails[] { new ComponentDocumentModelDetails("") }) @@ -2013,7 +2013,7 @@ public void Example_DocumentIntelligenceAdministrationClient_BuildClassifier_Sho AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary + BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails() }); @@ -2029,7 +2029,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_BuildClassifi AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary + BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails() }); @@ -2147,7 +2147,7 @@ public void Example_DocumentIntelligenceAdministrationClient_BuildClassifier_All AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary + BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails { @@ -2175,7 +2175,7 @@ public async Task Example_DocumentIntelligenceAdministrationClient_BuildClassifi AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceAdministrationClient client = new DocumentIntelligenceAdministrationClient(endpoint, credential); - BuildDocumentClassifierContent buildRequest = new BuildDocumentClassifierContent("", new Dictionary + BuildDocumentClassifierRequest buildRequest = new BuildDocumentClassifierRequest("", new Dictionary { ["key"] = new ClassifierDocumentTypeDetails { diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceClient.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceClient.cs index 0ea9020456de3..dce89050fa5e0 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceClient.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Generated/Samples/Samples_DocumentIntelligenceClient.cs @@ -534,7 +534,7 @@ public void Example_DocumentIntelligenceClient_AnalyzeDocument_AllParameters_Con AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); - AnalyzeDocumentContent analyzeRequest = new AnalyzeDocumentContent + AnalyzeDocumentRequest analyzeRequest = new AnalyzeDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), @@ -551,7 +551,7 @@ public async Task Example_DocumentIntelligenceClient_AnalyzeDocument_AllParamete AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); - AnalyzeDocumentContent analyzeRequest = new AnalyzeDocumentContent + AnalyzeDocumentRequest analyzeRequest = new AnalyzeDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), @@ -612,7 +612,7 @@ public void Example_DocumentIntelligenceClient_ClassifyDocument_ShortVersion_Con AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); - ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent(); + ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest(); Operation operation = client.ClassifyDocument(WaitUntil.Completed, "", classifyRequest); AnalyzeResult responseData = operation.Value; } @@ -625,7 +625,7 @@ public async Task Example_DocumentIntelligenceClient_ClassifyDocument_ShortVersi AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); - ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent(); + ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest(); Operation operation = await client.ClassifyDocumentAsync(WaitUntil.Completed, "", classifyRequest); AnalyzeResult responseData = operation.Value; } @@ -1080,7 +1080,7 @@ public void Example_DocumentIntelligenceClient_ClassifyDocument_AllParameters_Co AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); - ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent + ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), @@ -1097,7 +1097,7 @@ public async Task Example_DocumentIntelligenceClient_ClassifyDocument_AllParamet AzureKeyCredential credential = new AzureKeyCredential(""); DocumentIntelligenceClient client = new DocumentIntelligenceClient(endpoint, credential); - ClassifyDocumentContent classifyRequest = new ClassifyDocumentContent + ClassifyDocumentRequest classifyRequest = new ClassifyDocumentRequest { UrlSource = new Uri("http://localhost:3000"), Base64Source = BinaryData.FromObjectAsJson(new object()), diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.Serialization.cs index abb00641b6cad..85ada80eb0661 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.Serialization.cs @@ -77,7 +77,7 @@ internal static AgeMismatchInference DeserializeAgeMismatchInference(JsonElement return null; } string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -93,10 +93,10 @@ internal static AgeMismatchInference DeserializeAgeMismatchInference(JsonElement { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -107,7 +107,7 @@ internal static AgeMismatchInference DeserializeAgeMismatchInference(JsonElement } } serializedAdditionalRawData = rawDataDictionary; - return new AgeMismatchInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData); + return new AgeMismatchInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.cs index 414b37b6ceb07..5dca75345b85d 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/AgeMismatchInference.cs @@ -23,7 +23,7 @@ internal AgeMismatchInference() /// Discriminator. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. - internal AgeMismatchInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData) : base(kind, extension, serializedAdditionalRawData) + internal AgeMismatchInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData) : base(kind, extension, serializedAdditionalRawData) { } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Annotation.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Annotation.Serialization.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Annotation.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Annotation.Serialization.cs index 2b38bc72c4a1e..ab93c579d5db6 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Annotation.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Annotation.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Annotation : IUtf8JsonSerializable, IJsonModel + public partial class Annotation : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Annotation)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Annotation)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -71,19 +71,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteEndObject(); } - FhirR4Annotation IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Annotation IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Annotation)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Annotation)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Annotation(document.RootElement, options); + return DeserializeAnnotation(document.RootElement, options); } - internal static FhirR4Annotation DeserializeFhirR4Annotation(JsonElement element, ModelReaderWriterOptions options = null) + internal static Annotation DeserializeAnnotation(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -95,7 +95,7 @@ internal static FhirR4Annotation DeserializeFhirR4Annotation(JsonElement element string time = default; string text = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -126,10 +126,10 @@ internal static FhirR4Annotation DeserializeFhirR4Annotation(JsonElement element { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -140,52 +140,52 @@ internal static FhirR4Annotation DeserializeFhirR4Annotation(JsonElement element } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Annotation( + return new Annotation( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, authorString, time, text); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Annotation)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Annotation)} does not support writing '{options.Format}' format."); } } - FhirR4Annotation IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Annotation IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Annotation(document.RootElement, options); + return DeserializeAnnotation(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Annotation)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Annotation)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Annotation FromResponse(Response response) + internal static new Annotation FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Annotation(document.RootElement); + return DeserializeAnnotation(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Annotation.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Annotation.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Annotation.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Annotation.cs index 64c34dac94e5f..3016584bdaa70 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Annotation.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Annotation.cs @@ -14,34 +14,34 @@ namespace Azure.Health.Insights.RadiologyInsights /// A text note which also contains information about who made the statement and when /// Based on [FHIR Annotation](https://www.hl7.org/fhir/R4/datatypes.html#Annotation) /// - public partial class FhirR4Annotation : FhirR4Element + public partial class Annotation : Element { - /// Initializes a new instance of . + /// Initializes a new instance of . /// The annotation - text content (as markdown). /// is null. - public FhirR4Annotation(string text) + public Annotation(string text) { Argument.AssertNotNull(text, nameof(text)); Text = text; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Individual responsible for the annotation. /// When the annotation was made. /// The annotation - text content (as markdown). - internal FhirR4Annotation(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string authorString, string time, string text) : base(id, extension, serializedAdditionalRawData) + internal Annotation(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string authorString, string time, string text) : base(id, extension, serializedAdditionalRawData) { AuthorString = authorString; Time = time; Text = text; } - /// Initializes a new instance of for deserialization. - internal FhirR4Annotation() + /// Initializes a new instance of for deserialization. + internal Annotation() { } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4CodeableConcept.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CodeableConcept.Serialization.cs similarity index 68% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4CodeableConcept.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CodeableConcept.Serialization.cs index 8e0def5050f64..19fa462c0cce1 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4CodeableConcept.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CodeableConcept.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4CodeableConcept : IUtf8JsonSerializable, IJsonModel + public partial class CodeableConcept : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4CodeableConcept)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(CodeableConcept)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -74,19 +74,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteEndObject(); } - FhirR4CodeableConcept IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + CodeableConcept IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4CodeableConcept)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(CodeableConcept)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4CodeableConcept(document.RootElement, options); + return DeserializeCodeableConcept(document.RootElement, options); } - internal static FhirR4CodeableConcept DeserializeFhirR4CodeableConcept(JsonElement element, ModelReaderWriterOptions options = null) + internal static CodeableConcept DeserializeCodeableConcept(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -94,10 +94,10 @@ internal static FhirR4CodeableConcept DeserializeFhirR4CodeableConcept(JsonEleme { return null; } - IList coding = default; + IList coding = default; string text = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -108,10 +108,10 @@ internal static FhirR4CodeableConcept DeserializeFhirR4CodeableConcept(JsonEleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Coding.DeserializeFhirR4Coding(item, options)); + array.Add(RadiologyInsights.Coding.DeserializeCoding(item, options)); } coding = array; continue; @@ -132,10 +132,10 @@ internal static FhirR4CodeableConcept DeserializeFhirR4CodeableConcept(JsonEleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -146,46 +146,46 @@ internal static FhirR4CodeableConcept DeserializeFhirR4CodeableConcept(JsonEleme } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4CodeableConcept(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, coding ?? new ChangeTrackingList(), text); + return new CodeableConcept(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, coding ?? new ChangeTrackingList(), text); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4CodeableConcept)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(CodeableConcept)} does not support writing '{options.Format}' format."); } } - FhirR4CodeableConcept IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + CodeableConcept IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4CodeableConcept(document.RootElement, options); + return DeserializeCodeableConcept(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4CodeableConcept)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(CodeableConcept)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4CodeableConcept FromResponse(Response response) + internal static new CodeableConcept FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4CodeableConcept(document.RootElement); + return DeserializeCodeableConcept(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4CodeableConcept.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CodeableConcept.cs similarity index 64% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4CodeableConcept.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CodeableConcept.cs index 589f2bd149ad0..1bf6960ebebdf 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4CodeableConcept.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CodeableConcept.cs @@ -14,28 +14,28 @@ namespace Azure.Health.Insights.RadiologyInsights /// Concept - reference to a terminology or just text /// Based on [FHIR CodeableConcept](https://www.hl7.org/fhir/R4/datatypes.html#CodeableConcept) /// - public partial class FhirR4CodeableConcept : FhirR4Element + public partial class CodeableConcept : Element { - /// Initializes a new instance of . - public FhirR4CodeableConcept() + /// Initializes a new instance of . + public CodeableConcept() { - Coding = new ChangeTrackingList(); + Coding = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Code defined by a terminology system. /// Plain text representation of the concept. - internal FhirR4CodeableConcept(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, IList coding, string text) : base(id, extension, serializedAdditionalRawData) + internal CodeableConcept(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, IList coding, string text) : base(id, extension, serializedAdditionalRawData) { Coding = coding; Text = text; } /// Code defined by a terminology system. - public IList Coding { get; } + public IList Coding { get; } /// Plain text representation of the concept. public string Text { get; set; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Coding.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Coding.Serialization.cs similarity index 74% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Coding.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Coding.Serialization.cs index 8cec925808c5e..001fbe14ce4ce 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Coding.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Coding.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Coding : IUtf8JsonSerializable, IJsonModel + public partial class Coding : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Coding)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Coding)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -79,19 +79,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpti writer.WriteEndObject(); } - FhirR4Coding IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Coding IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Coding)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Coding)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Coding(document.RootElement, options); + return DeserializeCoding(document.RootElement, options); } - internal static FhirR4Coding DeserializeFhirR4Coding(JsonElement element, ModelReaderWriterOptions options = null) + internal static Coding DeserializeCoding(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -104,7 +104,7 @@ internal static FhirR4Coding DeserializeFhirR4Coding(JsonElement element, ModelR string code = default; string display = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -140,10 +140,10 @@ internal static FhirR4Coding DeserializeFhirR4Coding(JsonElement element, ModelR { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -154,9 +154,9 @@ internal static FhirR4Coding DeserializeFhirR4Coding(JsonElement element, ModelR } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Coding( + return new Coding( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, system, version, @@ -164,43 +164,43 @@ internal static FhirR4Coding DeserializeFhirR4Coding(JsonElement element, ModelR display); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Coding)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Coding)} does not support writing '{options.Format}' format."); } } - FhirR4Coding IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Coding IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Coding(document.RootElement, options); + return DeserializeCoding(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Coding)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Coding)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Coding FromResponse(Response response) + internal static new Coding FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Coding(document.RootElement); + return DeserializeCoding(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Coding.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Coding.cs similarity index 76% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Coding.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Coding.cs index 1b1946d799e17..e528d6185ce7d 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Coding.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Coding.cs @@ -14,14 +14,14 @@ namespace Azure.Health.Insights.RadiologyInsights /// A Coding is a representation of a defined concept using a symbol from a defined "code system". /// Based on [FHIR Coding](https://www.hl7.org/fhir/R4/datatypes.html#Coding) /// - public partial class FhirR4Coding : FhirR4Element + public partial class Coding : Element { - /// Initializes a new instance of . - public FhirR4Coding() + /// Initializes a new instance of . + public Coding() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. @@ -29,7 +29,7 @@ public FhirR4Coding() /// Version of the system - if relevant. /// Symbol in syntax defined by the system. /// Representation defined by the system. - internal FhirR4Coding(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string system, string version, string code, string display) : base(id, extension, serializedAdditionalRawData) + internal Coding(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string system, string version, string code, string display) : base(id, extension, serializedAdditionalRawData) { System = system; Version = version; diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.Serialization.cs index b073410d9284b..4a36d21c2162d 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.Serialization.cs @@ -98,18 +98,18 @@ internal static CompleteOrderDiscrepancyInference DeserializeCompleteOrderDiscre { return null; } - FhirR4CodeableConcept orderType = default; - IReadOnlyList missingBodyParts = default; - IReadOnlyList missingBodyPartMeasurements = default; + CodeableConcept orderType = default; + IReadOnlyList missingBodyParts = default; + IReadOnlyList missingBodyPartMeasurements = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("orderType"u8)) { - orderType = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + orderType = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("missingBodyParts"u8)) @@ -118,10 +118,10 @@ internal static CompleteOrderDiscrepancyInference DeserializeCompleteOrderDiscre { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } missingBodyParts = array; continue; @@ -132,10 +132,10 @@ internal static CompleteOrderDiscrepancyInference DeserializeCompleteOrderDiscre { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } missingBodyPartMeasurements = array; continue; @@ -151,10 +151,10 @@ internal static CompleteOrderDiscrepancyInference DeserializeCompleteOrderDiscre { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -167,11 +167,11 @@ internal static CompleteOrderDiscrepancyInference DeserializeCompleteOrderDiscre serializedAdditionalRawData = rawDataDictionary; return new CompleteOrderDiscrepancyInference( kind, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, orderType, - missingBodyParts ?? new ChangeTrackingList(), - missingBodyPartMeasurements ?? new ChangeTrackingList()); + missingBodyParts ?? new ChangeTrackingList(), + missingBodyPartMeasurements ?? new ChangeTrackingList()); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.cs index 28354c3187fc5..54d40d7f161ca 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CompleteOrderDiscrepancyInference.cs @@ -16,14 +16,14 @@ public partial class CompleteOrderDiscrepancyInference : RadiologyInsightsInfere /// Initializes a new instance of . /// Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast. /// is null. - internal CompleteOrderDiscrepancyInference(FhirR4CodeableConcept orderType) + internal CompleteOrderDiscrepancyInference(CodeableConcept orderType) { Argument.AssertNotNull(orderType, nameof(orderType)); Kind = "completeOrderDiscrepancy"; OrderType = orderType; - MissingBodyParts = new ChangeTrackingList(); - MissingBodyPartMeasurements = new ChangeTrackingList(); + MissingBodyParts = new ChangeTrackingList(); + MissingBodyPartMeasurements = new ChangeTrackingList(); } /// Initializes a new instance of . @@ -33,7 +33,7 @@ internal CompleteOrderDiscrepancyInference(FhirR4CodeableConcept orderType) /// Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast. /// List of missing body parts required by a complete order : SNOMED CT codes. /// List of missing body parts that require measurement by a complete order : SNOMED CT codes. - internal CompleteOrderDiscrepancyInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4CodeableConcept orderType, IReadOnlyList missingBodyParts, IReadOnlyList missingBodyPartMeasurements) : base(kind, extension, serializedAdditionalRawData) + internal CompleteOrderDiscrepancyInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CodeableConcept orderType, IReadOnlyList missingBodyParts, IReadOnlyList missingBodyPartMeasurements) : base(kind, extension, serializedAdditionalRawData) { OrderType = orderType; MissingBodyParts = missingBodyParts; @@ -46,10 +46,10 @@ internal CompleteOrderDiscrepancyInference() } /// Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast. - public FhirR4CodeableConcept OrderType { get; } + public CodeableConcept OrderType { get; } /// List of missing body parts required by a complete order : SNOMED CT codes. - public IReadOnlyList MissingBodyParts { get; } + public IReadOnlyList MissingBodyParts { get; } /// List of missing body parts that require measurement by a complete order : SNOMED CT codes. - public IReadOnlyList MissingBodyPartMeasurements { get; } + public IReadOnlyList MissingBodyPartMeasurements { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.Serialization.cs index 9d40feeaf5672..49bb0fa8465da 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.Serialization.cs @@ -72,7 +72,7 @@ internal static CriticalResult DeserializeCriticalResult(JsonElement element, Mo return null; } string description = default; - FhirR4Observation finding = default; + Observation finding = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -88,7 +88,7 @@ internal static CriticalResult DeserializeCriticalResult(JsonElement element, Mo { continue; } - finding = FhirR4Observation.DeserializeFhirR4Observation(property.Value, options); + finding = Observation.DeserializeObservation(property.Value, options); continue; } if (options.Format != "W") diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.cs index a399c70fa15b2..8c80022b76611 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResult.cs @@ -59,7 +59,7 @@ internal CriticalResult(string description) /// Description : medical problem. /// Finding linked to the critical result. /// Keeps track of any properties unknown to the library. - internal CriticalResult(string description, FhirR4Observation finding, IDictionary serializedAdditionalRawData) + internal CriticalResult(string description, Observation finding, IDictionary serializedAdditionalRawData) { Description = description; Finding = finding; @@ -74,6 +74,6 @@ internal CriticalResult() /// Description : medical problem. public string Description { get; } /// Finding linked to the critical result. - public FhirR4Observation Finding { get; } + public Observation Finding { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.Serialization.cs index c90188418bfc9..f7be41b662e13 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.Serialization.cs @@ -80,7 +80,7 @@ internal static CriticalResultInference DeserializeCriticalResultInference(JsonE } CriticalResult result = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -101,10 +101,10 @@ internal static CriticalResultInference DeserializeCriticalResultInference(JsonE { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -115,7 +115,7 @@ internal static CriticalResultInference DeserializeCriticalResultInference(JsonE } } serializedAdditionalRawData = rawDataDictionary; - return new CriticalResultInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, result); + return new CriticalResultInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, result); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.cs index 48459a97896e9..b4e56c6fcb3e8 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/CriticalResultInference.cs @@ -29,7 +29,7 @@ internal CriticalResultInference(CriticalResult result) /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// The complete Critical Result, as outlined below, will be reused for the recommendation. - internal CriticalResultInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CriticalResult result) : base(kind, extension, serializedAdditionalRawData) + internal CriticalResultInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CriticalResult result) : base(kind, extension, serializedAdditionalRawData) { Result = result; } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Docs/RadiologyInsightsClient.xml b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Docs/RadiologyInsightsClient.xml index 17241c9448e39..6d71099fc1535 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Docs/RadiologyInsightsClient.xml +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Docs/RadiologyInsightsClient.xml @@ -26,20 +26,20 @@ RadiologyInsightsData radiologyInsightsData = new RadiologyInsightsData(new Pati { new PatientRecord("") { - Info = new PatientDetails + Info = new PatientInfo { Sex = PatientSex.Female, BirthDate = DateTimeOffset.Parse("2022-05-10"), - ClinicalInfo = {new FhirR4Resource("") + ClinicalInfo = {new Resource("") { Id = "", - Meta = new FhirR4Meta + Meta = new Meta { VersionId = "", LastUpdated = "", Source = "", Profile = {""}, - Security = {new FhirR4Coding + Security = {new Coding { System = "", Version = "", @@ -136,20 +136,20 @@ RadiologyInsightsData radiologyInsightsData = new RadiologyInsightsData(new Pati { new PatientRecord("") { - Info = new PatientDetails + Info = new PatientInfo { Sex = PatientSex.Female, BirthDate = DateTimeOffset.Parse("2022-05-10"), - ClinicalInfo = {new FhirR4Resource("") + ClinicalInfo = {new Resource("") { Id = "", - Meta = new FhirR4Meta + Meta = new Meta { VersionId = "", LastUpdated = "", Source = "", Profile = {""}, - Security = {new FhirR4Coding + Security = {new Coding { System = "", Version = "", diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4DomainResource.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/DomainResource.Serialization.cs similarity index 68% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4DomainResource.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/DomainResource.Serialization.cs index dcd7b899dd56a..43a212c28ce63 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4DomainResource.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/DomainResource.Serialization.cs @@ -12,17 +12,17 @@ namespace Azure.Health.Insights.RadiologyInsights { - [PersistableModelProxy(typeof(UnknownFhirR4DomainResource))] - public partial class FhirR4DomainResource : IUtf8JsonSerializable, IJsonModel + [PersistableModelProxy(typeof(UnknownDomainResource))] + public partial class DomainResource : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -98,19 +98,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WriteEndObject(); } - FhirR4DomainResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + DomainResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4DomainResource(document.RootElement, options); + return DeserializeDomainResource(document.RootElement, options); } - internal static FhirR4DomainResource DeserializeFhirR4DomainResource(JsonElement element, ModelReaderWriterOptions options = null) + internal static DomainResource DeserializeDomainResource(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -122,49 +122,49 @@ internal static FhirR4DomainResource DeserializeFhirR4DomainResource(JsonElement { switch (discriminator.GetString()) { - case "Observation": return FhirR4Observation.DeserializeFhirR4Observation(element, options); + case "Observation": return Observation.DeserializeObservation(element, options); } } - return UnknownFhirR4DomainResource.DeserializeUnknownFhirR4DomainResource(element, options); + return UnknownDomainResource.DeserializeUnknownDomainResource(element, options); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support writing '{options.Format}' format."); } } - FhirR4DomainResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + DomainResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4DomainResource(document.RootElement, options); + return DeserializeDomainResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4DomainResource FromResponse(Response response) + internal static new DomainResource FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4DomainResource(document.RootElement); + return DeserializeDomainResource(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4DomainResource.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/DomainResource.cs similarity index 54% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4DomainResource.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/DomainResource.cs index b43dba55e31e7..afa050cb2ebae 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4DomainResource.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/DomainResource.cs @@ -13,24 +13,24 @@ namespace Azure.Health.Insights.RadiologyInsights /// /// A resource with narrative, extensions, and contained resources /// Based on [FHIR DomainResource](https://www.hl7.org/fhir/domainresource.html) - /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. - /// The available derived classes include . + /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. + /// The available derived classes include . /// - public abstract partial class FhirR4DomainResource : FhirR4Resource + public abstract partial class DomainResource : Resource { - /// Initializes a new instance of . + /// Initializes a new instance of . /// The type of resource. /// is null. - protected FhirR4DomainResource(string resourceType) : base(resourceType) + protected DomainResource(string resourceType) : base(resourceType) { Argument.AssertNotNull(resourceType, nameof(resourceType)); - Contained = new ChangeTrackingList(); - Extension = new ChangeTrackingList(); - ModifierExtension = new ChangeTrackingList(); + Contained = new ChangeTrackingList(); + Extension = new ChangeTrackingList(); + ModifierExtension = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The type of resource. /// Resource Id. /// Metadata about the resource. @@ -41,7 +41,7 @@ protected FhirR4DomainResource(string resourceType) : base(resourceType) /// Contained, inline Resources. /// Additional Content defined by implementations. /// Extensions that cannot be ignored. - internal FhirR4DomainResource(string resourceType, string id, FhirR4Meta meta, string implicitRules, string language, IDictionary additionalProperties, FhirR4Narrative text, IList contained, IList extension, IList modifierExtension) : base(resourceType, id, meta, implicitRules, language, additionalProperties) + internal DomainResource(string resourceType, string id, Meta meta, string implicitRules, string language, IDictionary additionalProperties, Narrative text, IList contained, IList extension, IList modifierExtension) : base(resourceType, id, meta, implicitRules, language, additionalProperties) { Text = text; Contained = contained; @@ -49,18 +49,18 @@ internal FhirR4DomainResource(string resourceType, string id, FhirR4Meta meta, s ModifierExtension = modifierExtension; } - /// Initializes a new instance of for deserialization. - internal FhirR4DomainResource() + /// Initializes a new instance of for deserialization. + internal DomainResource() { } /// Text summary of the resource, for human interpretation. - public FhirR4Narrative Text { get; set; } + public Narrative Text { get; set; } /// Contained, inline Resources. - public IList Contained { get; } + public IList Contained { get; } /// Additional Content defined by implementations. - public IList Extension { get; } + public IList Extension { get; } /// Extensions that cannot be ignored. - public IList ModifierExtension { get; } + public IList ModifierExtension { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Element.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Element.Serialization.cs similarity index 67% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Element.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Element.Serialization.cs index 9b87bcfd167c9..2a234d8e6bc6a 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Element.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Element.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Element : IUtf8JsonSerializable, IJsonModel + public partial class Element : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Element)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Element)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -59,19 +59,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpt writer.WriteEndObject(); } - FhirR4Element IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Element IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Element)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Element)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Element(document.RootElement, options); + return DeserializeElement(document.RootElement, options); } - internal static FhirR4Element DeserializeFhirR4Element(JsonElement element, ModelReaderWriterOptions options = null) + internal static Element DeserializeElement(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -80,7 +80,7 @@ internal static FhirR4Element DeserializeFhirR4Element(JsonElement element, Mode return null; } string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -96,10 +96,10 @@ internal static FhirR4Element DeserializeFhirR4Element(JsonElement element, Mode { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -110,46 +110,46 @@ internal static FhirR4Element DeserializeFhirR4Element(JsonElement element, Mode } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Element(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData); + return new Element(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Element)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Element)} does not support writing '{options.Format}' format."); } } - FhirR4Element IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Element IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Element(document.RootElement, options); + return DeserializeElement(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Element)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Element)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static FhirR4Element FromResponse(Response response) + internal static Element FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Element(document.RootElement); + return DeserializeElement(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Element.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Element.cs similarity index 82% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Element.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Element.cs index 3256b54d1b339..4e5149de146f3 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Element.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Element.cs @@ -14,7 +14,7 @@ namespace Azure.Health.Insights.RadiologyInsights /// The base definition for all elements contained inside a resource. /// Based on [FHIR Element](https://www.hl7.org/fhir/R4/element.html) /// - public partial class FhirR4Element + public partial class Element { /// /// Keeps track of any properties unknown to the library. @@ -48,17 +48,17 @@ public partial class FhirR4Element /// private protected IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - internal FhirR4Element() + /// Initializes a new instance of . + internal Element() { - Extension = new ChangeTrackingList(); + Extension = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. - internal FhirR4Element(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData) + internal Element(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData) { Id = id; Extension = extension; @@ -68,6 +68,6 @@ internal FhirR4Element(string id, IReadOnlyList extension, IDic /// Unique id for inter-element referencing. public string Id { get; } /// Additional Content defined by implementations. - public IReadOnlyList Extension { get; } + public IReadOnlyList Extension { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Extension.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Extension.Serialization.cs similarity index 77% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Extension.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Extension.Serialization.cs index 0629d8269aec8..c15500a0c894f 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Extension.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Extension.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Extension : IUtf8JsonSerializable, IJsonModel + public partial class Extension : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Extension)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(RadiologyInsights.Extension)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -121,19 +121,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO writer.WriteEndObject(); } - FhirR4Extension IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Extension IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Extension)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(RadiologyInsights.Extension)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Extension(document.RootElement, options); + return DeserializeExtension(document.RootElement, options); } - internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, ModelReaderWriterOptions options = null) + internal static Extension DeserializeExtension(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -142,20 +142,20 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, return null; } string url = default; - FhirR4Quantity valueQuantity = default; - FhirR4CodeableConcept valueCodeableConcept = default; + Quantity valueQuantity = default; + CodeableConcept valueCodeableConcept = default; string valueString = default; bool? valueBoolean = default; int? valueInteger = default; - FhirR4Range valueRange = default; - FhirR4Ratio valueRatio = default; - FhirR4SampledData valueSampledData = default; + Range valueRange = default; + Ratio valueRatio = default; + SampledData valueSampledData = default; TimeSpan? valueTime = default; string valueDateTime = default; - FhirR4Period valuePeriod = default; - FhirR4Reference valueReference = default; + Period valuePeriod = default; + Reference valueReference = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -171,7 +171,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valueQuantity = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + valueQuantity = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("valueCodeableConcept"u8)) @@ -180,7 +180,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valueCodeableConcept = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + valueCodeableConcept = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("valueString"u8)) @@ -212,7 +212,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valueRange = FhirR4Range.DeserializeFhirR4Range(property.Value, options); + valueRange = Range.DeserializeRange(property.Value, options); continue; } if (property.NameEquals("valueRatio"u8)) @@ -221,7 +221,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valueRatio = FhirR4Ratio.DeserializeFhirR4Ratio(property.Value, options); + valueRatio = Ratio.DeserializeRatio(property.Value, options); continue; } if (property.NameEquals("valueSampledData"u8)) @@ -230,7 +230,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valueSampledData = FhirR4SampledData.DeserializeFhirR4SampledData(property.Value, options); + valueSampledData = SampledData.DeserializeSampledData(property.Value, options); continue; } if (property.NameEquals("valueTime"u8)) @@ -253,7 +253,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valuePeriod = FhirR4Period.DeserializeFhirR4Period(property.Value, options); + valuePeriod = Period.DeserializePeriod(property.Value, options); continue; } if (property.NameEquals("valueReference"u8)) @@ -262,7 +262,7 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - valueReference = FhirR4Reference.DeserializeFhirR4Reference(property.Value, options); + valueReference = Reference.DeserializeReference(property.Value, options); continue; } if (property.NameEquals("id"u8)) @@ -276,10 +276,10 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(DeserializeFhirR4Extension(item, options)); + array.Add(DeserializeExtension(item, options)); } extension = array; continue; @@ -290,9 +290,9 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Extension( + return new Extension( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, url, valueQuantity, @@ -309,43 +309,43 @@ internal static FhirR4Extension DeserializeFhirR4Extension(JsonElement element, valueReference); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Extension)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(RadiologyInsights.Extension)} does not support writing '{options.Format}' format."); } } - FhirR4Extension IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Extension IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Extension(document.RootElement, options); + return DeserializeExtension(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Extension)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(RadiologyInsights.Extension)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Extension FromResponse(Response response) + internal static new Extension FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Extension(document.RootElement); + return DeserializeExtension(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Extension.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Extension.cs similarity index 71% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Extension.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Extension.cs index f089cb990ca59..1637edf943fb8 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Extension.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Extension.cs @@ -14,19 +14,19 @@ namespace Azure.Health.Insights.RadiologyInsights /// Base for all elements /// Based on [FHIR Element](https://www.hl7.org/fhir/datatypes.html#Element) /// - public partial class FhirR4Extension : FhirR4Element + public partial class Extension : Element { - /// Initializes a new instance of . + /// Initializes a new instance of . /// Source of the definition for the extension code - a logical name or a URL. /// is null. - public FhirR4Extension(string url) + public Extension(string url) { Argument.AssertNotNull(url, nameof(url)); Url = url; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. @@ -43,7 +43,7 @@ public FhirR4Extension(string url) /// Value as dateTime. /// Value as Period. /// Value as reference. - internal FhirR4Extension(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string url, FhirR4Quantity valueQuantity, FhirR4CodeableConcept valueCodeableConcept, string valueString, bool? valueBoolean, int? valueInteger, FhirR4Range valueRange, FhirR4Ratio valueRatio, FhirR4SampledData valueSampledData, TimeSpan? valueTime, string valueDateTime, FhirR4Period valuePeriod, FhirR4Reference valueReference) : base(id, extension, serializedAdditionalRawData) + internal Extension(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string url, Quantity valueQuantity, CodeableConcept valueCodeableConcept, string valueString, bool? valueBoolean, int? valueInteger, Range valueRange, Ratio valueRatio, SampledData valueSampledData, TimeSpan? valueTime, string valueDateTime, Period valuePeriod, Reference valueReference) : base(id, extension, serializedAdditionalRawData) { Url = url; ValueQuantity = valueQuantity; @@ -60,17 +60,17 @@ internal FhirR4Extension(string id, IReadOnlyList extension, ID ValueReference = valueReference; } - /// Initializes a new instance of for deserialization. - internal FhirR4Extension() + /// Initializes a new instance of for deserialization. + internal Extension() { } /// Source of the definition for the extension code - a logical name or a URL. public string Url { get; set; } /// Value as Quantity. - public FhirR4Quantity ValueQuantity { get; set; } + public Quantity ValueQuantity { get; set; } /// Value as CodeableConcept. - public FhirR4CodeableConcept ValueCodeableConcept { get; set; } + public CodeableConcept ValueCodeableConcept { get; set; } /// Value as string. public string ValueString { get; set; } /// Value as boolean. @@ -78,18 +78,18 @@ internal FhirR4Extension() /// Value as integer. public int? ValueInteger { get; set; } /// Value as Range. - public FhirR4Range ValueRange { get; set; } + public Range ValueRange { get; set; } /// Value as Ratio. - public FhirR4Ratio ValueRatio { get; set; } + public Ratio ValueRatio { get; set; } /// Value as SampledData. - public FhirR4SampledData ValueSampledData { get; set; } + public SampledData ValueSampledData { get; set; } /// Value as time (hh:mm:ss). public TimeSpan? ValueTime { get; set; } /// Value as dateTime. public string ValueDateTime { get; set; } /// Value as Period. - public FhirR4Period ValuePeriod { get; set; } + public Period ValuePeriod { get; set; } /// Value as reference. - public FhirR4Reference ValueReference { get; set; } + public Reference ValueReference { get; set; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.Serialization.cs index bfe023f431cfc..32cbc65295678 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.Serialization.cs @@ -78,16 +78,16 @@ internal static FindingInference DeserializeFindingInference(JsonElement element { return null; } - FhirR4Observation finding = default; + Observation finding = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("finding"u8)) { - finding = FhirR4Observation.DeserializeFhirR4Observation(property.Value, options); + finding = Observation.DeserializeObservation(property.Value, options); continue; } if (property.NameEquals("kind"u8)) @@ -101,10 +101,10 @@ internal static FindingInference DeserializeFindingInference(JsonElement element { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -115,7 +115,7 @@ internal static FindingInference DeserializeFindingInference(JsonElement element } } serializedAdditionalRawData = rawDataDictionary; - return new FindingInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, finding); + return new FindingInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, finding); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.cs index f1f5ec74a2fff..4ab9c3c4d1e52 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FindingInference.cs @@ -16,7 +16,7 @@ public partial class FindingInference : RadiologyInsightsInference /// Initializes a new instance of . /// Finding data : contains extensions, fields and components linked with the finding. /// is null. - internal FindingInference(FhirR4Observation finding) + internal FindingInference(Observation finding) { Argument.AssertNotNull(finding, nameof(finding)); @@ -29,7 +29,7 @@ internal FindingInference(FhirR4Observation finding) /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Finding data : contains extensions, fields and components linked with the finding. - internal FindingInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4Observation finding) : base(kind, extension, serializedAdditionalRawData) + internal FindingInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, Observation finding) : base(kind, extension, serializedAdditionalRawData) { Finding = finding; } @@ -40,6 +40,6 @@ internal FindingInference() } /// Finding data : contains extensions, fields and components linked with the finding. - public FhirR4Observation Finding { get; } + public Observation Finding { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.Serialization.cs index aafd34ec2a7a2..93fe13841c53e 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.Serialization.cs @@ -102,7 +102,7 @@ internal static FollowupCommunicationInference DeserializeFollowupCommunicationI IReadOnlyList recipient = default; bool wasAcknowledged = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -151,10 +151,10 @@ internal static FollowupCommunicationInference DeserializeFollowupCommunicationI { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -167,7 +167,7 @@ internal static FollowupCommunicationInference DeserializeFollowupCommunicationI serializedAdditionalRawData = rawDataDictionary; return new FollowupCommunicationInference( kind, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, dateTime ?? new ChangeTrackingList(), recipient ?? new ChangeTrackingList(), diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.cs index 37b9346b3812d..bdbe44957b260 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupCommunicationInference.cs @@ -30,7 +30,7 @@ internal FollowupCommunicationInference(bool wasAcknowledged) /// Communication date and time. /// Recipient of the communication. /// Communication was acknowledged. - internal FollowupCommunicationInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, IReadOnlyList dateTime, IReadOnlyList recipient, bool wasAcknowledged) : base(kind, extension, serializedAdditionalRawData) + internal FollowupCommunicationInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, IReadOnlyList dateTime, IReadOnlyList recipient, bool wasAcknowledged) : base(kind, extension, serializedAdditionalRawData) { DateTime = dateTime; Recipient = recipient; diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.Serialization.cs index 3c70fe908393f..43c63fcd6cb2d 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.Serialization.cs @@ -107,7 +107,7 @@ internal static FollowupRecommendationInference DeserializeFollowupRecommendatio return null; } string effectiveDateTime = default; - FhirR4Period effectivePeriod = default; + Period effectivePeriod = default; IReadOnlyList findings = default; bool isConditional = default; bool isOption = default; @@ -115,7 +115,7 @@ internal static FollowupRecommendationInference DeserializeFollowupRecommendatio bool isHedging = default; ProcedureRecommendation recommendedProcedure = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -131,7 +131,7 @@ internal static FollowupRecommendationInference DeserializeFollowupRecommendatio { continue; } - effectivePeriod = FhirR4Period.DeserializeFhirR4Period(property.Value, options); + effectivePeriod = Period.DeserializePeriod(property.Value, options); continue; } if (property.NameEquals("findings"u8)) @@ -184,10 +184,10 @@ internal static FollowupRecommendationInference DeserializeFollowupRecommendatio { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -200,7 +200,7 @@ internal static FollowupRecommendationInference DeserializeFollowupRecommendatio serializedAdditionalRawData = rawDataDictionary; return new FollowupRecommendationInference( kind, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, effectiveDateTime, effectivePeriod, diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.cs index b10f1217f9819..68a1040cbf630 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FollowupRecommendationInference.cs @@ -53,7 +53,7 @@ internal FollowupRecommendationInference(bool isConditional, bool isOption, bool /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include and . /// - internal FollowupRecommendationInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string effectiveDateTime, FhirR4Period effectivePeriod, IReadOnlyList findings, bool isConditional, bool isOption, bool isGuideline, bool isHedging, ProcedureRecommendation recommendedProcedure) : base(kind, extension, serializedAdditionalRawData) + internal FollowupRecommendationInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string effectiveDateTime, Period effectivePeriod, IReadOnlyList findings, bool isConditional, bool isOption, bool isGuideline, bool isHedging, ProcedureRecommendation recommendedProcedure) : base(kind, extension, serializedAdditionalRawData) { EffectiveDateTime = effectiveDateTime; EffectivePeriod = effectivePeriod; @@ -73,7 +73,7 @@ internal FollowupRecommendationInference() /// Date and time are displayed when the procedure is recommended to be done at a specific point in time. public string EffectiveDateTime { get; } /// The period is shown if a specific period is mentioned, with a start and end date-time. - public FhirR4Period EffectivePeriod { get; } + public Period EffectivePeriod { get; } /// Findings related to the recommendation. public IReadOnlyList Findings { get; } /// The conditional value indicates whether or not the sentence containing the recommendation includes a conditional statement. Keywords for conditional statements include 'if', 'when', 'unless', and so on. diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.Serialization.cs index 44e1dfc197f6f..8cd5c2bf0721d 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.Serialization.cs @@ -73,7 +73,7 @@ internal static GenericProcedureRecommendation DeserializeGenericProcedureRecomm { return null; } - FhirR4CodeableConcept code = default; + CodeableConcept code = default; string description = default; string kind = default; IDictionary serializedAdditionalRawData = default; @@ -82,7 +82,7 @@ internal static GenericProcedureRecommendation DeserializeGenericProcedureRecomm { if (property.NameEquals("code"u8)) { - code = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + code = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.cs index 849cbe81f617d..dc8d9a852d45a 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/GenericProcedureRecommendation.cs @@ -16,7 +16,7 @@ public partial class GenericProcedureRecommendation : ProcedureRecommendation /// Initializes a new instance of . /// Procedure modality : SNOMED CT code. /// is null. - internal GenericProcedureRecommendation(FhirR4CodeableConcept code) + internal GenericProcedureRecommendation(CodeableConcept code) { Argument.AssertNotNull(code, nameof(code)); @@ -29,7 +29,7 @@ internal GenericProcedureRecommendation(FhirR4CodeableConcept code) /// Keeps track of any properties unknown to the library. /// Procedure modality : SNOMED CT code. /// Procedure description : MANAGEMENT PROCEDURE (PROCEDURE) or CONSULTATION (PROCEDURE) based on SNOMED CT. - internal GenericProcedureRecommendation(string kind, IDictionary serializedAdditionalRawData, FhirR4CodeableConcept code, string description) : base(kind, serializedAdditionalRawData) + internal GenericProcedureRecommendation(string kind, IDictionary serializedAdditionalRawData, CodeableConcept code, string description) : base(kind, serializedAdditionalRawData) { Code = code; Description = description; @@ -41,7 +41,7 @@ internal GenericProcedureRecommendation() } /// Procedure modality : SNOMED CT code. - public FhirR4CodeableConcept Code { get; } + public CodeableConcept Code { get; } /// Procedure description : MANAGEMENT PROCEDURE (PROCEDURE) or CONSULTATION (PROCEDURE) based on SNOMED CT. public string Description { get; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/HealthInsightsRadiologyInsightsModelFactory.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/HealthInsightsRadiologyInsightsModelFactory.cs index 8d71a45c1d22b..9337800e80cef 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/HealthInsightsRadiologyInsightsModelFactory.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/HealthInsightsRadiologyInsightsModelFactory.cs @@ -20,7 +20,7 @@ public static partial class HealthInsightsRadiologyInsightsModelFactory /// Patient encounters/visits. /// Patient unstructured clinical data, given as documents. /// A new instance for mocking. - public static PatientRecord PatientRecord(string id = null, PatientDetails info = null, IEnumerable encounters = null, IEnumerable patientDocuments = null) + public static PatientRecord PatientRecord(string id = null, PatientInfo info = null, IEnumerable encounters = null, IEnumerable patientDocuments = null) { encounters ??= new List(); patientDocuments ??= new List(); @@ -28,18 +28,18 @@ public static PatientRecord PatientRecord(string id = null, PatientDetails info return new PatientRecord(id, info, encounters?.ToList(), patientDocuments?.ToList(), serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. - /// A new instance for mocking. - public static FhirR4Element FhirR4Element(string id = null, IEnumerable extension = null) + /// A new instance for mocking. + public static Element Element(string id = null, IEnumerable extension = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Element(id, extension?.ToList(), serializedAdditionalRawData: null); + return new Element(id, extension?.ToList(), serializedAdditionalRawData: null); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Source of the definition for the extension code - a logical name or a URL. @@ -55,12 +55,12 @@ public static FhirR4Element FhirR4Element(string id = null, IEnumerable Value as dateTime. /// Value as Period. /// Value as reference. - /// A new instance for mocking. - public static FhirR4Extension FhirR4Extension(string id = null, IEnumerable extension = null, string url = null, FhirR4Quantity valueQuantity = null, FhirR4CodeableConcept valueCodeableConcept = null, string valueString = null, bool? valueBoolean = null, int? valueInteger = null, FhirR4Range valueRange = null, FhirR4Ratio valueRatio = null, FhirR4SampledData valueSampledData = null, TimeSpan? valueTime = null, string valueDateTime = null, FhirR4Period valuePeriod = null, FhirR4Reference valueReference = null) + /// A new instance for mocking. + public static Extension Extension(string id = null, IEnumerable extension = null, string url = null, Quantity valueQuantity = null, CodeableConcept valueCodeableConcept = null, string valueString = null, bool? valueBoolean = null, int? valueInteger = null, Range valueRange = null, Ratio valueRatio = null, SampledData valueSampledData = null, TimeSpan? valueTime = null, string valueDateTime = null, Period valuePeriod = null, Reference valueReference = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Extension( + return new Extension( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -79,7 +79,7 @@ public static FhirR4Extension FhirR4Extension(string id = null, IEnumerable Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Numerical value (with implicit precision). @@ -87,12 +87,12 @@ public static FhirR4Extension FhirR4Extension(string id = null, IEnumerable Unit representation. /// System that defines coded unit form. /// Coded form of the unit. - /// A new instance for mocking. - public static FhirR4Quantity FhirR4Quantity(string id = null, IEnumerable extension = null, double? value = null, string comparator = null, string unit = null, string system = null, string code = null) + /// A new instance for mocking. + public static Quantity Quantity(string id = null, IEnumerable extension = null, double? value = null, string comparator = null, string unit = null, string system = null, string code = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Quantity( + return new Quantity( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -103,33 +103,33 @@ public static FhirR4Quantity FhirR4Quantity(string id = null, IEnumerable Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Code defined by a terminology system. /// Plain text representation of the concept. - /// A new instance for mocking. - public static FhirR4CodeableConcept FhirR4CodeableConcept(string id = null, IEnumerable extension = null, IEnumerable coding = null, string text = null) + /// A new instance for mocking. + public static CodeableConcept CodeableConcept(string id = null, IEnumerable extension = null, IEnumerable coding = null, string text = null) { - extension ??= new List(); - coding ??= new List(); + extension ??= new List(); + coding ??= new List(); - return new FhirR4CodeableConcept(id, extension?.ToList(), serializedAdditionalRawData: null, coding?.ToList(), text); + return new CodeableConcept(id, extension?.ToList(), serializedAdditionalRawData: null, coding?.ToList(), text); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Identity of the terminology system. /// Version of the system - if relevant. /// Symbol in syntax defined by the system. /// Representation defined by the system. - /// A new instance for mocking. - public static FhirR4Coding FhirR4Coding(string id = null, IEnumerable extension = null, string system = null, string version = null, string code = null, string display = null) + /// A new instance for mocking. + public static Coding Coding(string id = null, IEnumerable extension = null, string system = null, string version = null, string code = null, string display = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Coding( + return new Coding( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -139,33 +139,33 @@ public static FhirR4Coding FhirR4Coding(string id = null, IEnumerable Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Low limit. /// High limit. - /// A new instance for mocking. - public static FhirR4Range FhirR4Range(string id = null, IEnumerable extension = null, FhirR4Quantity low = null, FhirR4Quantity high = null) + /// A new instance for mocking. + public static Range Range(string id = null, IEnumerable extension = null, Quantity low = null, Quantity high = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Range(id, extension?.ToList(), serializedAdditionalRawData: null, low, high); + return new Range(id, extension?.ToList(), serializedAdditionalRawData: null, low, high); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Numerator value. /// Denominator value. - /// A new instance for mocking. - public static FhirR4Ratio FhirR4Ratio(string id = null, IEnumerable extension = null, FhirR4Quantity numerator = null, FhirR4Quantity denominator = null) + /// A new instance for mocking. + public static Ratio Ratio(string id = null, IEnumerable extension = null, Quantity numerator = null, Quantity denominator = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Ratio(id, extension?.ToList(), serializedAdditionalRawData: null, numerator, denominator); + return new Ratio(id, extension?.ToList(), serializedAdditionalRawData: null, numerator, denominator); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Zero value and units. @@ -175,12 +175,12 @@ public static FhirR4Ratio FhirR4Ratio(string id = null, IEnumerable Upper limit of detection. /// Number of sample points at each time point. /// Decimal values with spaces, or "E" | "U" | "L". - /// A new instance for mocking. - public static FhirR4SampledData FhirR4SampledData(string id = null, IEnumerable extension = null, FhirR4Quantity origin = null, double period = default, double? factor = null, double? lowerLimit = null, double? upperLimit = null, int dimensions = default, string data = null) + /// A new instance for mocking. + public static SampledData SampledData(string id = null, IEnumerable extension = null, Quantity origin = null, double period = default, double? factor = null, double? lowerLimit = null, double? upperLimit = null, int dimensions = default, string data = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4SampledData( + return new SampledData( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -193,42 +193,42 @@ public static FhirR4SampledData FhirR4SampledData(string id = null, IEnumerable< data); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Starting time with inclusive boundary. /// End time with inclusive boundary, if not ongoing. - /// A new instance for mocking. - public static FhirR4Period FhirR4Period(string id = null, IEnumerable extension = null, string start = null, string end = null) + /// A new instance for mocking. + public static Period Period(string id = null, IEnumerable extension = null, string start = null, string end = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Period(id, extension?.ToList(), serializedAdditionalRawData: null, start, end); + return new Period(id, extension?.ToList(), serializedAdditionalRawData: null, start, end); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. - /// Literal reference, Relative, internal or absolute URL. + /// Literal reference, Relative, internal or absolute URL. /// Type the reference refers to (e.g. "Patient"). /// Logical reference, when literal reference is not known. /// Text alternative for the resource. - /// A new instance for mocking. - public static FhirR4Reference FhirR4Reference(string id = null, IEnumerable extension = null, string reference = null, string type = null, FhirR4Identifier identifier = null, string display = null) + /// A new instance for mocking. + public static Reference Reference(string id = null, IEnumerable extension = null, string referenceProperty = null, string type = null, Identifier identifier = null, string display = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Reference( + return new Reference( id, extension?.ToList(), serializedAdditionalRawData: null, - reference, + referenceProperty, type, identifier, display); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// usual | official | temp | secondary | old (If known). @@ -237,12 +237,12 @@ public static FhirR4Reference FhirR4Reference(string id = null, IEnumerable The value that is unique. /// Time period when id is/was valid for use. /// Organization that issued id (may be just text). - /// A new instance for mocking. - public static FhirR4Identifier FhirR4Identifier(string id = null, IEnumerable extension = null, string use = null, FhirR4CodeableConcept type = null, string system = null, string value = null, FhirR4Period period = null, FhirR4Reference assigner = null) + /// A new instance for mocking. + public static Identifier Identifier(string id = null, IEnumerable extension = null, string use = null, CodeableConcept type = null, string system = null, string value = null, Period period = null, Reference assigner = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Identifier( + return new Identifier( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -325,9 +325,9 @@ public static RadiologyInsightsPatientResult RadiologyInsightsPatientResult(stri /// Discriminator. /// Additional Content defined by implementations. /// A new instance for mocking. - public static RadiologyInsightsInference RadiologyInsightsInference(string kind = null, IEnumerable extension = null) + public static RadiologyInsightsInference RadiologyInsightsInference(string kind = null, IEnumerable extension = null) { - extension ??= new List(); + extension ??= new List(); return new UnknownRadiologyInsightsInference(kind, extension?.ToList(), serializedAdditionalRawData: null); } @@ -335,9 +335,9 @@ public static RadiologyInsightsInference RadiologyInsightsInference(string kind /// Initializes a new instance of . /// Additional Content defined by implementations. /// A new instance for mocking. - public static AgeMismatchInference AgeMismatchInference(IEnumerable extension = null) + public static AgeMismatchInference AgeMismatchInference(IEnumerable extension = null) { - extension ??= new List(); + extension ??= new List(); return new AgeMismatchInference("ageMismatch", extension?.ToList(), serializedAdditionalRawData: null); } @@ -346,9 +346,9 @@ public static AgeMismatchInference AgeMismatchInference(IEnumerable Additional Content defined by implementations. /// Sex indication : SNOMED CT code for gender finding. /// A new instance for mocking. - public static SexMismatchInference SexMismatchInference(IEnumerable extension = null, FhirR4CodeableConcept sexIndication = null) + public static SexMismatchInference SexMismatchInference(IEnumerable extension = null, CodeableConcept sexIndication = null) { - extension ??= new List(); + extension ??= new List(); return new SexMismatchInference("sexMismatch", extension?.ToList(), serializedAdditionalRawData: null, sexIndication); } @@ -358,9 +358,9 @@ public static SexMismatchInference SexMismatchInference(IEnumerable Laterality indication : SNOMED CT code for laterality qualifier value. /// Mismatch type : orderLateralityMismatch, textLateralityContradiction, textLateralityMissing. /// A new instance for mocking. - public static LateralityDiscrepancyInference LateralityDiscrepancyInference(IEnumerable extension = null, FhirR4CodeableConcept lateralityIndication = null, LateralityDiscrepancyType discrepancyType = default) + public static LateralityDiscrepancyInference LateralityDiscrepancyInference(IEnumerable extension = null, CodeableConcept lateralityIndication = null, LateralityDiscrepancyType discrepancyType = default) { - extension ??= new List(); + extension ??= new List(); return new LateralityDiscrepancyInference("lateralityDiscrepancy", extension?.ToList(), serializedAdditionalRawData: null, lateralityIndication, discrepancyType); } @@ -371,11 +371,11 @@ public static LateralityDiscrepancyInference LateralityDiscrepancyInference(IEnu /// List of missing body parts required by a complete order : SNOMED CT codes. /// List of missing body parts that require measurement by a complete order : SNOMED CT codes. /// A new instance for mocking. - public static CompleteOrderDiscrepancyInference CompleteOrderDiscrepancyInference(IEnumerable extension = null, FhirR4CodeableConcept orderType = null, IEnumerable missingBodyParts = null, IEnumerable missingBodyPartMeasurements = null) + public static CompleteOrderDiscrepancyInference CompleteOrderDiscrepancyInference(IEnumerable extension = null, CodeableConcept orderType = null, IEnumerable missingBodyParts = null, IEnumerable missingBodyPartMeasurements = null) { - extension ??= new List(); - missingBodyParts ??= new List(); - missingBodyPartMeasurements ??= new List(); + extension ??= new List(); + missingBodyParts ??= new List(); + missingBodyPartMeasurements ??= new List(); return new CompleteOrderDiscrepancyInference( "completeOrderDiscrepancy", @@ -392,11 +392,11 @@ public static CompleteOrderDiscrepancyInference CompleteOrderDiscrepancyInferenc /// List of body parts found in the document : SNOMED CT codes. /// List of body parts that are measured according to the document : SNOMED CT codes. /// A new instance for mocking. - public static LimitedOrderDiscrepancyInference LimitedOrderDiscrepancyInference(IEnumerable extension = null, FhirR4CodeableConcept orderType = null, IEnumerable presentBodyParts = null, IEnumerable presentBodyPartMeasurements = null) + public static LimitedOrderDiscrepancyInference LimitedOrderDiscrepancyInference(IEnumerable extension = null, CodeableConcept orderType = null, IEnumerable presentBodyParts = null, IEnumerable presentBodyPartMeasurements = null) { - extension ??= new List(); - presentBodyParts ??= new List(); - presentBodyPartMeasurements ??= new List(); + extension ??= new List(); + presentBodyParts ??= new List(); + presentBodyPartMeasurements ??= new List(); return new LimitedOrderDiscrepancyInference( "limitedOrderDiscrepancy", @@ -411,38 +411,38 @@ public static LimitedOrderDiscrepancyInference LimitedOrderDiscrepancyInference( /// Additional Content defined by implementations. /// Finding data : contains extensions, fields and components linked with the finding. /// A new instance for mocking. - public static FindingInference FindingInference(IEnumerable extension = null, FhirR4Observation finding = null) + public static FindingInference FindingInference(IEnumerable extension = null, Observation finding = null) { - extension ??= new List(); + extension ??= new List(); return new FindingInference("finding", extension?.ToList(), serializedAdditionalRawData: null, finding); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// generated, extensions, additional, empty. /// xhtml. - /// A new instance for mocking. - public static FhirR4Narrative FhirR4Narrative(string id = null, IEnumerable extension = null, string status = null, string div = null) + /// A new instance for mocking. + public static Narrative Narrative(string id = null, IEnumerable extension = null, string status = null, string div = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Narrative(id, extension?.ToList(), serializedAdditionalRawData: null, status, div); + return new Narrative(id, extension?.ToList(), serializedAdditionalRawData: null, status, div); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Individual responsible for the annotation. /// When the annotation was made. /// The annotation - text content (as markdown). - /// A new instance for mocking. - public static FhirR4Annotation FhirR4Annotation(string id = null, IEnumerable extension = null, string authorString = null, string time = null, string text = null) + /// A new instance for mocking. + public static Annotation Annotation(string id = null, IEnumerable extension = null, string authorString = null, string time = null, string text = null) { - extension ??= new List(); + extension ??= new List(); - return new FhirR4Annotation( + return new Annotation( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -451,7 +451,7 @@ public static FhirR4Annotation FhirR4Annotation(string id = null, IEnumerable Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Type of component observation (code / type). @@ -470,14 +470,14 @@ public static FhirR4Annotation FhirR4Annotation(string id = null, IEnumerable Why the component result is missing. /// High, low, normal, etc. /// Provides guide for interpretation of component result. - /// A new instance for mocking. - public static FhirR4ObservationComponent FhirR4ObservationComponent(string id = null, IEnumerable extension = null, FhirR4CodeableConcept code = null, FhirR4Quantity valueQuantity = null, FhirR4CodeableConcept valueCodeableConcept = null, string valueString = null, bool? valueBoolean = null, int? valueInteger = null, FhirR4Range valueRange = null, FhirR4Ratio valueRatio = null, FhirR4SampledData valueSampledData = null, TimeSpan? valueTime = null, string valueDateTime = null, FhirR4Period valuePeriod = null, FhirR4Reference valueReference = null, FhirR4CodeableConcept dataAbsentReason = null, IEnumerable interpretation = null, IEnumerable referenceRange = null) + /// A new instance for mocking. + public static ObservationComponent ObservationComponent(string id = null, IEnumerable extension = null, CodeableConcept code = null, Quantity valueQuantity = null, CodeableConcept valueCodeableConcept = null, string valueString = null, bool? valueBoolean = null, int? valueInteger = null, Range valueRange = null, Ratio valueRatio = null, SampledData valueSampledData = null, TimeSpan? valueTime = null, string valueDateTime = null, Period valuePeriod = null, Reference valueReference = null, CodeableConcept dataAbsentReason = null, IEnumerable interpretation = null, IEnumerable referenceRange = null) { - extension ??= new List(); - interpretation ??= new List(); - referenceRange ??= new List(); + extension ??= new List(); + interpretation ??= new List(); + referenceRange ??= new List(); - return new FhirR4ObservationComponent( + return new ObservationComponent( id, extension?.ToList(), serializedAdditionalRawData: null, @@ -503,9 +503,9 @@ public static FhirR4ObservationComponent FhirR4ObservationComponent(string id = /// Additional Content defined by implementations. /// The complete Critical Result, as outlined below, will be reused for the recommendation. /// A new instance for mocking. - public static CriticalResultInference CriticalResultInference(IEnumerable extension = null, CriticalResult result = null) + public static CriticalResultInference CriticalResultInference(IEnumerable extension = null, CriticalResult result = null) { - extension ??= new List(); + extension ??= new List(); return new CriticalResultInference("criticalResult", extension?.ToList(), serializedAdditionalRawData: null, result); } @@ -514,7 +514,7 @@ public static CriticalResultInference CriticalResultInference(IEnumerable Description : medical problem. /// Finding linked to the critical result. /// A new instance for mocking. - public static CriticalResult CriticalResult(string description = null, FhirR4Observation finding = null) + public static CriticalResult CriticalResult(string description = null, Observation finding = null) { return new CriticalResult(description, finding, serializedAdditionalRawData: null); } @@ -525,10 +525,10 @@ public static CriticalResult CriticalResult(string description = null, FhirR4Obs /// Imaging procedures. /// Ordered procedure information from the document information or text. /// A new instance for mocking. - public static RadiologyProcedureInference RadiologyProcedureInference(IEnumerable extension = null, IEnumerable procedureCodes = null, IEnumerable imagingProcedures = null, OrderedProcedure orderedProcedure = null) + public static RadiologyProcedureInference RadiologyProcedureInference(IEnumerable extension = null, IEnumerable procedureCodes = null, IEnumerable imagingProcedures = null, OrderedProcedure orderedProcedure = null) { - extension ??= new List(); - procedureCodes ??= new List(); + extension ??= new List(); + procedureCodes ??= new List(); imagingProcedures ??= new List(); return new RadiologyProcedureInference( @@ -547,7 +547,7 @@ public static RadiologyProcedureInference RadiologyProcedureInference(IEnumerabl /// Contrast : see RadiologyCodeWithTypes (below). /// View : see RadiologyCodeWithTypes (below). /// A new instance for mocking. - public static ImagingProcedure ImagingProcedure(FhirR4CodeableConcept modality = null, FhirR4CodeableConcept anatomy = null, FhirR4CodeableConcept laterality = null, RadiologyCodeWithTypes contrast = null, RadiologyCodeWithTypes view = null) + public static ImagingProcedure ImagingProcedure(CodeableConcept modality = null, CodeableConcept anatomy = null, CodeableConcept laterality = null, RadiologyCodeWithTypes contrast = null, RadiologyCodeWithTypes view = null) { return new ImagingProcedure( modality, @@ -562,9 +562,9 @@ public static ImagingProcedure ImagingProcedure(FhirR4CodeableConcept modality = /// The SNOMED CT code indicates whether imaging was conducted with or without contrast in the case of contrast, and in the case of views, it denotes the number of views. /// The collection of types will indicate the contrast substance used in the case of contrast and, in the case of views, it will specify the types of views, such as lateral and frontal, etc. /// A new instance for mocking. - public static RadiologyCodeWithTypes RadiologyCodeWithTypes(FhirR4CodeableConcept code = null, IEnumerable types = null) + public static RadiologyCodeWithTypes RadiologyCodeWithTypes(CodeableConcept code = null, IEnumerable types = null) { - types ??= new List(); + types ??= new List(); return new RadiologyCodeWithTypes(code, types?.ToList(), serializedAdditionalRawData: null); } @@ -584,9 +584,9 @@ public static RadiologyCodeWithTypes RadiologyCodeWithTypes(FhirR4CodeableConcep /// The available derived classes include and . /// /// A new instance for mocking. - public static FollowupRecommendationInference FollowupRecommendationInference(IEnumerable extension = null, string effectiveDateTime = null, FhirR4Period effectivePeriod = null, IEnumerable findings = null, bool isConditional = default, bool isOption = default, bool isGuideline = default, bool isHedging = default, ProcedureRecommendation recommendedProcedure = null) + public static FollowupRecommendationInference FollowupRecommendationInference(IEnumerable extension = null, string effectiveDateTime = null, Period effectivePeriod = null, IEnumerable findings = null, bool isConditional = default, bool isOption = default, bool isGuideline = default, bool isHedging = default, ProcedureRecommendation recommendedProcedure = null) { - extension ??= new List(); + extension ??= new List(); findings ??= new List(); return new FollowupRecommendationInference( @@ -609,9 +609,9 @@ public static FollowupRecommendationInference FollowupRecommendationInference(IE /// Critical result linked to a recommendation. /// Recommendation finding status. /// A new instance for mocking. - public static RecommendationFinding RecommendationFinding(IEnumerable extension = null, FhirR4Observation finding = null, CriticalResult criticalFinding = null, RecommendationFindingStatusType recommendationFindingStatus = default) + public static RecommendationFinding RecommendationFinding(IEnumerable extension = null, Observation finding = null, CriticalResult criticalFinding = null, RecommendationFindingStatusType recommendationFindingStatus = default) { - extension ??= new List(); + extension ??= new List(); return new RecommendationFinding(extension?.ToList(), finding, criticalFinding, recommendationFindingStatus, serializedAdditionalRawData: null); } @@ -620,7 +620,7 @@ public static RecommendationFinding RecommendationFinding(IEnumerable Procedure modality : SNOMED CT code. /// Procedure description : MANAGEMENT PROCEDURE (PROCEDURE) or CONSULTATION (PROCEDURE) based on SNOMED CT. /// A new instance for mocking. - public static GenericProcedureRecommendation GenericProcedureRecommendation(FhirR4CodeableConcept code = null, string description = null) + public static GenericProcedureRecommendation GenericProcedureRecommendation(CodeableConcept code = null, string description = null) { return new GenericProcedureRecommendation("genericProcedureRecommendation", serializedAdditionalRawData: null, code, description); } @@ -629,9 +629,9 @@ public static GenericProcedureRecommendation GenericProcedureRecommendation(Fhir /// LOINC codes for the procedure. /// Imaging procedures. /// A new instance for mocking. - public static ImagingProcedureRecommendation ImagingProcedureRecommendation(IEnumerable procedureCodes = null, IEnumerable imagingProcedures = null) + public static ImagingProcedureRecommendation ImagingProcedureRecommendation(IEnumerable procedureCodes = null, IEnumerable imagingProcedures = null) { - procedureCodes ??= new List(); + procedureCodes ??= new List(); imagingProcedures ??= new List(); return new ImagingProcedureRecommendation("imagingProcedureRecommendation", serializedAdditionalRawData: null, procedureCodes?.ToList(), imagingProcedures?.ToList()); @@ -643,9 +643,9 @@ public static ImagingProcedureRecommendation ImagingProcedureRecommendation(IEnu /// Recipient of the communication. /// Communication was acknowledged. /// A new instance for mocking. - public static FollowupCommunicationInference FollowupCommunicationInference(IEnumerable extension = null, IEnumerable dateTime = null, IEnumerable recipient = null, bool wasAcknowledged = default) + public static FollowupCommunicationInference FollowupCommunicationInference(IEnumerable extension = null, IEnumerable dateTime = null, IEnumerable recipient = null, bool wasAcknowledged = default) { - extension ??= new List(); + extension ??= new List(); dateTime ??= new List(); recipient ??= new List(); diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Identifier.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Identifier.Serialization.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Identifier.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Identifier.Serialization.cs index 58f29307e2bb7..1834a66049bfa 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Identifier.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Identifier.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Identifier : IUtf8JsonSerializable, IJsonModel + public partial class Identifier : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Identifier)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Identifier)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -89,19 +89,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteEndObject(); } - FhirR4Identifier IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Identifier IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Identifier)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Identifier)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Identifier(document.RootElement, options); + return DeserializeIdentifier(document.RootElement, options); } - internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element, ModelReaderWriterOptions options = null) + internal static Identifier DeserializeIdentifier(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -110,13 +110,13 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element return null; } string use = default; - FhirR4CodeableConcept type = default; + CodeableConcept type = default; string system = default; string value = default; - FhirR4Period period = default; - FhirR4Reference assigner = default; + Period period = default; + Reference assigner = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -132,7 +132,7 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element { continue; } - type = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + type = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("system"u8)) @@ -151,7 +151,7 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element { continue; } - period = FhirR4Period.DeserializeFhirR4Period(property.Value, options); + period = Period.DeserializePeriod(property.Value, options); continue; } if (property.NameEquals("assigner"u8)) @@ -160,7 +160,7 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element { continue; } - assigner = FhirR4Reference.DeserializeFhirR4Reference(property.Value, options); + assigner = Reference.DeserializeReference(property.Value, options); continue; } if (property.NameEquals("id"u8)) @@ -174,10 +174,10 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -188,9 +188,9 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Identifier( + return new Identifier( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, use, type, @@ -200,43 +200,43 @@ internal static FhirR4Identifier DeserializeFhirR4Identifier(JsonElement element assigner); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Identifier)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Identifier)} does not support writing '{options.Format}' format."); } } - FhirR4Identifier IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Identifier IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Identifier(document.RootElement, options); + return DeserializeIdentifier(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Identifier)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Identifier)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Identifier FromResponse(Response response) + internal static new Identifier FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Identifier(document.RootElement); + return DeserializeIdentifier(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Identifier.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Identifier.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Identifier.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Identifier.cs index 4ab92d0588d9b..ee5f6b13a3886 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Identifier.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Identifier.cs @@ -14,14 +14,14 @@ namespace Azure.Health.Insights.RadiologyInsights /// An identifier intended for computation /// Based on [FHIR Identifier](https://www.hl7.org/fhir/R4/identifier.html) /// - public partial class FhirR4Identifier : FhirR4Element + public partial class Identifier : Element { - /// Initializes a new instance of . - public FhirR4Identifier() + /// Initializes a new instance of . + public Identifier() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. @@ -31,7 +31,7 @@ public FhirR4Identifier() /// The value that is unique. /// Time period when id is/was valid for use. /// Organization that issued id (may be just text). - internal FhirR4Identifier(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string use, FhirR4CodeableConcept type, string system, string value, FhirR4Period period, FhirR4Reference assigner) : base(id, extension, serializedAdditionalRawData) + internal Identifier(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string use, CodeableConcept type, string system, string value, Period period, Reference assigner) : base(id, extension, serializedAdditionalRawData) { Use = use; Type = type; @@ -44,14 +44,14 @@ internal FhirR4Identifier(string id, IReadOnlyList extension, I /// usual | official | temp | secondary | old (If known). public string Use { get; set; } /// Description of identifier. - public FhirR4CodeableConcept Type { get; set; } + public CodeableConcept Type { get; set; } /// The namespace for the identifier value. public string System { get; set; } /// The value that is unique. public string Value { get; set; } /// Time period when id is/was valid for use. - public FhirR4Period Period { get; set; } + public Period Period { get; set; } /// Organization that issued id (may be just text). - public FhirR4Reference Assigner { get; set; } + public Reference Assigner { get; set; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.Serialization.cs index 2f1549b3ecc5e..f21d06ece8d13 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.Serialization.cs @@ -83,9 +83,9 @@ internal static ImagingProcedure DeserializeImagingProcedure(JsonElement element { return null; } - FhirR4CodeableConcept modality = default; - FhirR4CodeableConcept anatomy = default; - FhirR4CodeableConcept laterality = default; + CodeableConcept modality = default; + CodeableConcept anatomy = default; + CodeableConcept laterality = default; RadiologyCodeWithTypes contrast = default; RadiologyCodeWithTypes view = default; IDictionary serializedAdditionalRawData = default; @@ -94,12 +94,12 @@ internal static ImagingProcedure DeserializeImagingProcedure(JsonElement element { if (property.NameEquals("modality"u8)) { - modality = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + modality = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("anatomy"u8)) { - anatomy = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + anatomy = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("laterality"u8)) @@ -108,7 +108,7 @@ internal static ImagingProcedure DeserializeImagingProcedure(JsonElement element { continue; } - laterality = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + laterality = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("contrast"u8)) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.cs index 23fbc4ccdcf6e..7a550dd038d6c 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedure.cs @@ -49,7 +49,7 @@ public partial class ImagingProcedure /// Modality : SNOMED CT code. /// Anatomy : SNOMED CT code. /// or is null. - internal ImagingProcedure(FhirR4CodeableConcept modality, FhirR4CodeableConcept anatomy) + internal ImagingProcedure(CodeableConcept modality, CodeableConcept anatomy) { Argument.AssertNotNull(modality, nameof(modality)); Argument.AssertNotNull(anatomy, nameof(anatomy)); @@ -65,7 +65,7 @@ internal ImagingProcedure(FhirR4CodeableConcept modality, FhirR4CodeableConcept /// Contrast : see RadiologyCodeWithTypes (below). /// View : see RadiologyCodeWithTypes (below). /// Keeps track of any properties unknown to the library. - internal ImagingProcedure(FhirR4CodeableConcept modality, FhirR4CodeableConcept anatomy, FhirR4CodeableConcept laterality, RadiologyCodeWithTypes contrast, RadiologyCodeWithTypes view, IDictionary serializedAdditionalRawData) + internal ImagingProcedure(CodeableConcept modality, CodeableConcept anatomy, CodeableConcept laterality, RadiologyCodeWithTypes contrast, RadiologyCodeWithTypes view, IDictionary serializedAdditionalRawData) { Modality = modality; Anatomy = anatomy; @@ -81,11 +81,11 @@ internal ImagingProcedure() } /// Modality : SNOMED CT code. - public FhirR4CodeableConcept Modality { get; } + public CodeableConcept Modality { get; } /// Anatomy : SNOMED CT code. - public FhirR4CodeableConcept Anatomy { get; } + public CodeableConcept Anatomy { get; } /// Laterality : SNOMED CT code. - public FhirR4CodeableConcept Laterality { get; } + public CodeableConcept Laterality { get; } /// Contrast : see RadiologyCodeWithTypes (below). public RadiologyCodeWithTypes Contrast { get; } /// View : see RadiologyCodeWithTypes (below). diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.Serialization.cs index 5c9753573f08b..2d67778c3e91e 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.Serialization.cs @@ -83,7 +83,7 @@ internal static ImagingProcedureRecommendation DeserializeImagingProcedureRecomm { return null; } - IReadOnlyList procedureCodes = default; + IReadOnlyList procedureCodes = default; IReadOnlyList imagingProcedures = default; string kind = default; IDictionary serializedAdditionalRawData = default; @@ -96,10 +96,10 @@ internal static ImagingProcedureRecommendation DeserializeImagingProcedureRecomm { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } procedureCodes = array; continue; @@ -125,7 +125,7 @@ internal static ImagingProcedureRecommendation DeserializeImagingProcedureRecomm } } serializedAdditionalRawData = rawDataDictionary; - return new ImagingProcedureRecommendation(kind, serializedAdditionalRawData, procedureCodes ?? new ChangeTrackingList(), imagingProcedures); + return new ImagingProcedureRecommendation(kind, serializedAdditionalRawData, procedureCodes ?? new ChangeTrackingList(), imagingProcedures); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.cs index cd5b0223d3b8c..b5a6e4de95b59 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ImagingProcedureRecommendation.cs @@ -22,7 +22,7 @@ internal ImagingProcedureRecommendation(IEnumerable imagingPro Argument.AssertNotNull(imagingProcedures, nameof(imagingProcedures)); Kind = "imagingProcedureRecommendation"; - ProcedureCodes = new ChangeTrackingList(); + ProcedureCodes = new ChangeTrackingList(); ImagingProcedures = imagingProcedures.ToList(); } @@ -31,7 +31,7 @@ internal ImagingProcedureRecommendation(IEnumerable imagingPro /// Keeps track of any properties unknown to the library. /// LOINC codes for the procedure. /// Imaging procedures. - internal ImagingProcedureRecommendation(string kind, IDictionary serializedAdditionalRawData, IReadOnlyList procedureCodes, IReadOnlyList imagingProcedures) : base(kind, serializedAdditionalRawData) + internal ImagingProcedureRecommendation(string kind, IDictionary serializedAdditionalRawData, IReadOnlyList procedureCodes, IReadOnlyList imagingProcedures) : base(kind, serializedAdditionalRawData) { ProcedureCodes = procedureCodes; ImagingProcedures = imagingProcedures; @@ -43,7 +43,7 @@ internal ImagingProcedureRecommendation() } /// LOINC codes for the procedure. - public IReadOnlyList ProcedureCodes { get; } + public IReadOnlyList ProcedureCodes { get; } /// Imaging procedures. public IReadOnlyList ImagingProcedures { get; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.Serialization.cs index 34f9f6d665d8a..9744bbbb393ea 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.Serialization.cs @@ -83,10 +83,10 @@ internal static LateralityDiscrepancyInference DeserializeLateralityDiscrepancyI { return null; } - FhirR4CodeableConcept lateralityIndication = default; + CodeableConcept lateralityIndication = default; LateralityDiscrepancyType discrepancyType = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -97,7 +97,7 @@ internal static LateralityDiscrepancyInference DeserializeLateralityDiscrepancyI { continue; } - lateralityIndication = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + lateralityIndication = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("discrepancyType"u8)) @@ -116,10 +116,10 @@ internal static LateralityDiscrepancyInference DeserializeLateralityDiscrepancyI { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -130,7 +130,7 @@ internal static LateralityDiscrepancyInference DeserializeLateralityDiscrepancyI } } serializedAdditionalRawData = rawDataDictionary; - return new LateralityDiscrepancyInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, lateralityIndication, discrepancyType); + return new LateralityDiscrepancyInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, lateralityIndication, discrepancyType); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.cs index 438680b8ae5bc..282fe112d6176 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LateralityDiscrepancyInference.cs @@ -27,7 +27,7 @@ internal LateralityDiscrepancyInference(LateralityDiscrepancyType discrepancyTyp /// Keeps track of any properties unknown to the library. /// Laterality indication : SNOMED CT code for laterality qualifier value. /// Mismatch type : orderLateralityMismatch, textLateralityContradiction, textLateralityMissing. - internal LateralityDiscrepancyInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4CodeableConcept lateralityIndication, LateralityDiscrepancyType discrepancyType) : base(kind, extension, serializedAdditionalRawData) + internal LateralityDiscrepancyInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CodeableConcept lateralityIndication, LateralityDiscrepancyType discrepancyType) : base(kind, extension, serializedAdditionalRawData) { LateralityIndication = lateralityIndication; DiscrepancyType = discrepancyType; @@ -39,7 +39,7 @@ internal LateralityDiscrepancyInference() } /// Laterality indication : SNOMED CT code for laterality qualifier value. - public FhirR4CodeableConcept LateralityIndication { get; } + public CodeableConcept LateralityIndication { get; } /// Mismatch type : orderLateralityMismatch, textLateralityContradiction, textLateralityMissing. public LateralityDiscrepancyType DiscrepancyType { get; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.Serialization.cs index 8cf4618d5672e..c6c80c2a54cba 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.Serialization.cs @@ -98,18 +98,18 @@ internal static LimitedOrderDiscrepancyInference DeserializeLimitedOrderDiscrepa { return null; } - FhirR4CodeableConcept orderType = default; - IReadOnlyList presentBodyParts = default; - IReadOnlyList presentBodyPartMeasurements = default; + CodeableConcept orderType = default; + IReadOnlyList presentBodyParts = default; + IReadOnlyList presentBodyPartMeasurements = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("orderType"u8)) { - orderType = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + orderType = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("presentBodyParts"u8)) @@ -118,10 +118,10 @@ internal static LimitedOrderDiscrepancyInference DeserializeLimitedOrderDiscrepa { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } presentBodyParts = array; continue; @@ -132,10 +132,10 @@ internal static LimitedOrderDiscrepancyInference DeserializeLimitedOrderDiscrepa { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } presentBodyPartMeasurements = array; continue; @@ -151,10 +151,10 @@ internal static LimitedOrderDiscrepancyInference DeserializeLimitedOrderDiscrepa { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -167,11 +167,11 @@ internal static LimitedOrderDiscrepancyInference DeserializeLimitedOrderDiscrepa serializedAdditionalRawData = rawDataDictionary; return new LimitedOrderDiscrepancyInference( kind, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, orderType, - presentBodyParts ?? new ChangeTrackingList(), - presentBodyPartMeasurements ?? new ChangeTrackingList()); + presentBodyParts ?? new ChangeTrackingList(), + presentBodyPartMeasurements ?? new ChangeTrackingList()); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.cs index 7450e33520708..e0149d410dc41 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/LimitedOrderDiscrepancyInference.cs @@ -16,14 +16,14 @@ public partial class LimitedOrderDiscrepancyInference : RadiologyInsightsInferen /// Initializes a new instance of . /// Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast. /// is null. - internal LimitedOrderDiscrepancyInference(FhirR4CodeableConcept orderType) + internal LimitedOrderDiscrepancyInference(CodeableConcept orderType) { Argument.AssertNotNull(orderType, nameof(orderType)); Kind = "limitedOrderDiscrepancy"; OrderType = orderType; - PresentBodyParts = new ChangeTrackingList(); - PresentBodyPartMeasurements = new ChangeTrackingList(); + PresentBodyParts = new ChangeTrackingList(); + PresentBodyPartMeasurements = new ChangeTrackingList(); } /// Initializes a new instance of . @@ -33,7 +33,7 @@ internal LimitedOrderDiscrepancyInference(FhirR4CodeableConcept orderType) /// Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast. /// List of body parts found in the document : SNOMED CT codes. /// List of body parts that are measured according to the document : SNOMED CT codes. - internal LimitedOrderDiscrepancyInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4CodeableConcept orderType, IReadOnlyList presentBodyParts, IReadOnlyList presentBodyPartMeasurements) : base(kind, extension, serializedAdditionalRawData) + internal LimitedOrderDiscrepancyInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CodeableConcept orderType, IReadOnlyList presentBodyParts, IReadOnlyList presentBodyPartMeasurements) : base(kind, extension, serializedAdditionalRawData) { OrderType = orderType; PresentBodyParts = presentBodyParts; @@ -46,10 +46,10 @@ internal LimitedOrderDiscrepancyInference() } /// Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast. - public FhirR4CodeableConcept OrderType { get; } + public CodeableConcept OrderType { get; } /// List of body parts found in the document : SNOMED CT codes. - public IReadOnlyList PresentBodyParts { get; } + public IReadOnlyList PresentBodyParts { get; } /// List of body parts that are measured according to the document : SNOMED CT codes. - public IReadOnlyList PresentBodyPartMeasurements { get; } + public IReadOnlyList PresentBodyPartMeasurements { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Meta.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Meta.Serialization.cs similarity index 75% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Meta.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Meta.Serialization.cs index c84840501c902..ec2ae09068864 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Meta.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Meta.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Meta : IUtf8JsonSerializable, IJsonModel + public partial class Meta : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Meta)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Meta)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -89,19 +89,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteEndObject(); } - FhirR4Meta IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Meta IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Meta)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Meta)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Meta(document.RootElement, options); + return DeserializeMeta(document.RootElement, options); } - internal static FhirR4Meta DeserializeFhirR4Meta(JsonElement element, ModelReaderWriterOptions options = null) + internal static Meta DeserializeMeta(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -113,8 +113,8 @@ internal static FhirR4Meta DeserializeFhirR4Meta(JsonElement element, ModelReade string lastUpdated = default; string source = default; IList profile = default; - IList security = default; - IList tag = default; + IList security = default; + IList tag = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -154,10 +154,10 @@ internal static FhirR4Meta DeserializeFhirR4Meta(JsonElement element, ModelReade { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Coding.DeserializeFhirR4Coding(item, options)); + array.Add(Coding.DeserializeCoding(item, options)); } security = array; continue; @@ -168,10 +168,10 @@ internal static FhirR4Meta DeserializeFhirR4Meta(JsonElement element, ModelReade { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Coding.DeserializeFhirR4Coding(item, options)); + array.Add(Coding.DeserializeCoding(item, options)); } tag = array; continue; @@ -182,53 +182,53 @@ internal static FhirR4Meta DeserializeFhirR4Meta(JsonElement element, ModelReade } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Meta( + return new Meta( versionId, lastUpdated, source, profile ?? new ChangeTrackingList(), - security ?? new ChangeTrackingList(), - tag ?? new ChangeTrackingList(), + security ?? new ChangeTrackingList(), + tag ?? new ChangeTrackingList(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Meta)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Meta)} does not support writing '{options.Format}' format."); } } - FhirR4Meta IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Meta IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Meta(document.RootElement, options); + return DeserializeMeta(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Meta)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Meta)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static FhirR4Meta FromResponse(Response response) + internal static Meta FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Meta(document.RootElement); + return DeserializeMeta(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Meta.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Meta.cs similarity index 88% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Meta.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Meta.cs index 767d8723b6a77..30ef0e62df526 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Meta.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Meta.cs @@ -14,7 +14,7 @@ namespace Azure.Health.Insights.RadiologyInsights /// Metadata about a resource /// Based on [FHIR Meta](https://www.hl7.org/fhir/R4/resource.html#Meta) /// - public partial class FhirR4Meta + public partial class Meta { /// /// Keeps track of any properties unknown to the library. @@ -48,15 +48,15 @@ public partial class FhirR4Meta /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public FhirR4Meta() + /// Initializes a new instance of . + public Meta() { Profile = new ChangeTrackingList(); - Security = new ChangeTrackingList(); - Tag = new ChangeTrackingList(); + Security = new ChangeTrackingList(); + Tag = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The version specific identifier, as it appears in the version portion of the URL. This value changes when the resource is created, updated, or deleted. /// When the resource last changed - e.g. when the version changed. /// A uri that identifies the source system of the resource. This provides a minimal amount of Provenance information that can be used to track or differentiate the source of information in the resource. The source may identify another FHIR server, document, message, database, etc. @@ -64,7 +64,7 @@ public FhirR4Meta() /// Security labels applied to this resource. These tags connect specific resources to the overall security policy and infrastructure. /// Tags applied to this resource. Tags are intended to be used to identify and relate resources to process and workflow, and applications are not required to consider the tags when interpreting the meaning of a resource. /// Keeps track of any properties unknown to the library. - internal FhirR4Meta(string versionId, string lastUpdated, string source, IList profile, IList security, IList tag, IDictionary serializedAdditionalRawData) + internal Meta(string versionId, string lastUpdated, string source, IList profile, IList security, IList tag, IDictionary serializedAdditionalRawData) { VersionId = versionId; LastUpdated = lastUpdated; @@ -84,8 +84,8 @@ internal FhirR4Meta(string versionId, string lastUpdated, string source, IList A list of profiles (references to [StructureDefinition](https://www.hl7.org/fhir/structuredefinition.html) resources) that this resource claims to conform to. The URL is a reference to [StructureDefinition.url](https://www.hl7.org/fhir/structuredefinition-definitions.html#StructureDefinition.url). public IList Profile { get; } /// Security labels applied to this resource. These tags connect specific resources to the overall security policy and infrastructure. - public IList Security { get; } + public IList Security { get; } /// Tags applied to this resource. Tags are intended to be used to identify and relate resources to process and workflow, and applications are not required to consider the tags when interpreting the meaning of a resource. - public IList Tag { get; } + public IList Tag { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Narrative.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Narrative.Serialization.cs similarity index 69% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Narrative.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Narrative.Serialization.cs index 05507afe3f5f0..6fdb5a1274247 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Narrative.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Narrative.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Narrative : IUtf8JsonSerializable, IJsonModel + public partial class Narrative : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Narrative)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Narrative)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -63,19 +63,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO writer.WriteEndObject(); } - FhirR4Narrative IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Narrative IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Narrative)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Narrative)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Narrative(document.RootElement, options); + return DeserializeNarrative(document.RootElement, options); } - internal static FhirR4Narrative DeserializeFhirR4Narrative(JsonElement element, ModelReaderWriterOptions options = null) + internal static Narrative DeserializeNarrative(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -86,7 +86,7 @@ internal static FhirR4Narrative DeserializeFhirR4Narrative(JsonElement element, string status = default; string div = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -112,10 +112,10 @@ internal static FhirR4Narrative DeserializeFhirR4Narrative(JsonElement element, { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -126,46 +126,46 @@ internal static FhirR4Narrative DeserializeFhirR4Narrative(JsonElement element, } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Narrative(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, status, div); + return new Narrative(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, status, div); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Narrative)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Narrative)} does not support writing '{options.Format}' format."); } } - FhirR4Narrative IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Narrative IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Narrative(document.RootElement, options); + return DeserializeNarrative(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Narrative)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Narrative)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Narrative FromResponse(Response response) + internal static new Narrative FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Narrative(document.RootElement); + return DeserializeNarrative(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Narrative.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Narrative.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Narrative.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Narrative.cs index d2d9ceb9104de..be174888c807a 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Narrative.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Narrative.cs @@ -14,13 +14,13 @@ namespace Azure.Health.Insights.RadiologyInsights /// Any resource that is a [DomainResource](https://www.hl7.org/fhir/domainresource.html) may include a human-readable narrative that contains a summary of the resource and may be used to represent the content of the resource to a human. /// Based on [FHIR Narrative](https://www.hl7.org/fhir/R4/narrative.html#Narrative) /// - public partial class FhirR4Narrative : FhirR4Element + public partial class Narrative : Element { - /// Initializes a new instance of . + /// Initializes a new instance of . /// generated, extensions, additional, empty. /// xhtml. /// or is null. - public FhirR4Narrative(string status, string div) + public Narrative(string status, string div) { Argument.AssertNotNull(status, nameof(status)); Argument.AssertNotNull(div, nameof(div)); @@ -29,20 +29,20 @@ public FhirR4Narrative(string status, string div) Div = div; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// generated, extensions, additional, empty. /// xhtml. - internal FhirR4Narrative(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string status, string div) : base(id, extension, serializedAdditionalRawData) + internal Narrative(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string status, string div) : base(id, extension, serializedAdditionalRawData) { Status = status; Div = div; } - /// Initializes a new instance of for deserialization. - internal FhirR4Narrative() + /// Initializes a new instance of for deserialization. + internal Narrative() { } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Observation.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Observation.Serialization.cs similarity index 76% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Observation.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Observation.Serialization.cs index ea746999fd9db..01605e0a16347 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Observation.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Observation.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Observation : IUtf8JsonSerializable, IJsonModel + public partial class Observation : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Observation)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Observation)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -282,19 +282,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrite writer.WriteEndObject(); } - FhirR4Observation IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Observation IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Observation)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Observation)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Observation(document.RootElement, options); + return DeserializeObservation(document.RootElement, options); } - internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement element, ModelReaderWriterOptions options = null) + internal static Observation DeserializeObservation(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -302,43 +302,43 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { return null; } - IList identifier = default; + IList identifier = default; ObservationStatusCodeType status = default; - IList category = default; - FhirR4CodeableConcept code = default; - FhirR4Reference subject = default; - FhirR4Reference encounter = default; + IList category = default; + CodeableConcept code = default; + Reference subject = default; + Reference encounter = default; string effectiveDateTime = default; - FhirR4Period effectivePeriod = default; + Period effectivePeriod = default; string effectiveInstant = default; string issued = default; - FhirR4Quantity valueQuantity = default; - FhirR4CodeableConcept valueCodeableConcept = default; + Quantity valueQuantity = default; + CodeableConcept valueCodeableConcept = default; string valueString = default; bool? valueBoolean = default; int? valueInteger = default; - FhirR4Range valueRange = default; - FhirR4Ratio valueRatio = default; - FhirR4SampledData valueSampledData = default; + Range valueRange = default; + Ratio valueRatio = default; + SampledData valueSampledData = default; TimeSpan? valueTime = default; string valueDateTime = default; - FhirR4Period valuePeriod = default; - FhirR4CodeableConcept dataAbsentReason = default; - IList interpretation = default; - IList note = default; - FhirR4CodeableConcept bodySite = default; - FhirR4CodeableConcept method = default; - IList referenceRange = default; - IList hasMember = default; - IList derivedFrom = default; - IList component = default; - FhirR4Narrative text = default; - IList contained = default; - IList extension = default; - IList modifierExtension = default; + Period valuePeriod = default; + CodeableConcept dataAbsentReason = default; + IList interpretation = default; + IList note = default; + CodeableConcept bodySite = default; + CodeableConcept method = default; + IList referenceRange = default; + IList hasMember = default; + IList derivedFrom = default; + IList component = default; + Narrative text = default; + IList contained = default; + IList extension = default; + IList modifierExtension = default; string resourceType = default; string id = default; - FhirR4Meta meta = default; + Meta meta = default; string implicitRules = default; string language = default; IDictionary additionalProperties = default; @@ -351,10 +351,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Identifier.DeserializeFhirR4Identifier(item, options)); + array.Add(RadiologyInsights.Identifier.DeserializeIdentifier(item, options)); } identifier = array; continue; @@ -370,17 +370,17 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } category = array; continue; } if (property.NameEquals("code"u8)) { - code = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + code = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("subject"u8)) @@ -389,7 +389,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - subject = FhirR4Reference.DeserializeFhirR4Reference(property.Value, options); + subject = Reference.DeserializeReference(property.Value, options); continue; } if (property.NameEquals("encounter"u8)) @@ -398,7 +398,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - encounter = FhirR4Reference.DeserializeFhirR4Reference(property.Value, options); + encounter = Reference.DeserializeReference(property.Value, options); continue; } if (property.NameEquals("effectiveDateTime"u8)) @@ -412,7 +412,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - effectivePeriod = FhirR4Period.DeserializeFhirR4Period(property.Value, options); + effectivePeriod = Period.DeserializePeriod(property.Value, options); continue; } if (property.NameEquals("effectiveInstant"u8)) @@ -431,7 +431,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - valueQuantity = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + valueQuantity = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("valueCodeableConcept"u8)) @@ -440,7 +440,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - valueCodeableConcept = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + valueCodeableConcept = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("valueString"u8)) @@ -472,7 +472,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - valueRange = FhirR4Range.DeserializeFhirR4Range(property.Value, options); + valueRange = Range.DeserializeRange(property.Value, options); continue; } if (property.NameEquals("valueRatio"u8)) @@ -481,7 +481,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - valueRatio = FhirR4Ratio.DeserializeFhirR4Ratio(property.Value, options); + valueRatio = Ratio.DeserializeRatio(property.Value, options); continue; } if (property.NameEquals("valueSampledData"u8)) @@ -490,7 +490,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - valueSampledData = FhirR4SampledData.DeserializeFhirR4SampledData(property.Value, options); + valueSampledData = SampledData.DeserializeSampledData(property.Value, options); continue; } if (property.NameEquals("valueTime"u8)) @@ -513,7 +513,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - valuePeriod = FhirR4Period.DeserializeFhirR4Period(property.Value, options); + valuePeriod = Period.DeserializePeriod(property.Value, options); continue; } if (property.NameEquals("dataAbsentReason"u8)) @@ -522,7 +522,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - dataAbsentReason = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + dataAbsentReason = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("interpretation"u8)) @@ -531,10 +531,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } interpretation = array; continue; @@ -545,10 +545,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Annotation.DeserializeFhirR4Annotation(item, options)); + array.Add(Annotation.DeserializeAnnotation(item, options)); } note = array; continue; @@ -559,7 +559,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - bodySite = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + bodySite = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("method"u8)) @@ -568,7 +568,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - method = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + method = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("referenceRange"u8)) @@ -577,10 +577,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4ObservationReferenceRange.DeserializeFhirR4ObservationReferenceRange(item, options)); + array.Add(ObservationReferenceRange.DeserializeObservationReferenceRange(item, options)); } referenceRange = array; continue; @@ -591,10 +591,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Reference.DeserializeFhirR4Reference(item, options)); + array.Add(Reference.DeserializeReference(item, options)); } hasMember = array; continue; @@ -605,10 +605,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Reference.DeserializeFhirR4Reference(item, options)); + array.Add(Reference.DeserializeReference(item, options)); } derivedFrom = array; continue; @@ -619,10 +619,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4ObservationComponent.DeserializeFhirR4ObservationComponent(item, options)); + array.Add(ObservationComponent.DeserializeObservationComponent(item, options)); } component = array; continue; @@ -633,7 +633,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - text = FhirR4Narrative.DeserializeFhirR4Narrative(property.Value, options); + text = Narrative.DeserializeNarrative(property.Value, options); continue; } if (property.NameEquals("contained"u8)) @@ -642,10 +642,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(DeserializeFhirR4Resource(item, options)); + array.Add(DeserializeResource(item, options)); } contained = array; continue; @@ -656,10 +656,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -670,10 +670,10 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } modifierExtension = array; continue; @@ -694,7 +694,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme { continue; } - meta = FhirR4Meta.DeserializeFhirR4Meta(property.Value, options); + meta = Meta.DeserializeMeta(property.Value, options); continue; } if (property.NameEquals("implicitRules"u8)) @@ -710,7 +710,7 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new FhirR4Observation( + return new Observation( resourceType, id, meta, @@ -718,12 +718,12 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme language, additionalProperties, text, - contained ?? new ChangeTrackingList(), - extension ?? new ChangeTrackingList(), - modifierExtension ?? new ChangeTrackingList(), - identifier ?? new ChangeTrackingList(), + contained ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), + modifierExtension ?? new ChangeTrackingList(), + identifier ?? new ChangeTrackingList(), status, - category ?? new ChangeTrackingList(), + category ?? new ChangeTrackingList(), code, subject, encounter, @@ -743,53 +743,53 @@ internal static FhirR4Observation DeserializeFhirR4Observation(JsonElement eleme valueDateTime, valuePeriod, dataAbsentReason, - interpretation ?? new ChangeTrackingList(), - note ?? new ChangeTrackingList(), + interpretation ?? new ChangeTrackingList(), + note ?? new ChangeTrackingList(), bodySite, method, - referenceRange ?? new ChangeTrackingList(), - hasMember ?? new ChangeTrackingList(), - derivedFrom ?? new ChangeTrackingList(), - component ?? new ChangeTrackingList()); + referenceRange ?? new ChangeTrackingList(), + hasMember ?? new ChangeTrackingList(), + derivedFrom ?? new ChangeTrackingList(), + component ?? new ChangeTrackingList()); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Observation)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Observation)} does not support writing '{options.Format}' format."); } } - FhirR4Observation IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Observation IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Observation(document.RootElement, options); + return DeserializeObservation(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Observation)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Observation)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Observation FromResponse(Response response) + internal static new Observation FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Observation(document.RootElement); + return DeserializeObservation(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Observation.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Observation.cs similarity index 66% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Observation.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Observation.cs index 0beeaec78b39f..0d021cea9b51b 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Observation.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Observation.cs @@ -14,29 +14,29 @@ namespace Azure.Health.Insights.RadiologyInsights /// Detailed information about observations /// Based on [FHIR Observation](https://www.hl7.org/fhir/R4/observation.html) /// - public partial class FhirR4Observation : FhirR4DomainResource + public partial class Observation : DomainResource { - /// Initializes a new instance of . + /// Initializes a new instance of . /// registered | preliminary | final | amended +. /// Type of observation (code / type). /// is null. - public FhirR4Observation(ObservationStatusCodeType status, FhirR4CodeableConcept code) : base("Observation") + public Observation(ObservationStatusCodeType status, CodeableConcept code) : base("Observation") { Argument.AssertNotNull(code, nameof(code)); - Identifier = new ChangeTrackingList(); + Identifier = new ChangeTrackingList(); Status = status; - Category = new ChangeTrackingList(); + Category = new ChangeTrackingList(); Code = code; - Interpretation = new ChangeTrackingList(); - Note = new ChangeTrackingList(); - ReferenceRange = new ChangeTrackingList(); - HasMember = new ChangeTrackingList(); - DerivedFrom = new ChangeTrackingList(); - Component = new ChangeTrackingList(); + Interpretation = new ChangeTrackingList(); + Note = new ChangeTrackingList(); + ReferenceRange = new ChangeTrackingList(); + HasMember = new ChangeTrackingList(); + DerivedFrom = new ChangeTrackingList(); + Component = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The type of resource. /// Resource Id. /// Metadata about the resource. @@ -77,7 +77,7 @@ public FhirR4Observation(ObservationStatusCodeType status, FhirR4CodeableConcept /// Related resource that belongs to the Observation group. /// Related measurements the observation is made from. /// Component results. - internal FhirR4Observation(string resourceType, string id, FhirR4Meta meta, string implicitRules, string language, IDictionary additionalProperties, FhirR4Narrative text, IList contained, IList extension, IList modifierExtension, IList identifier, ObservationStatusCodeType status, IList category, FhirR4CodeableConcept code, FhirR4Reference subject, FhirR4Reference encounter, string effectiveDateTime, FhirR4Period effectivePeriod, string effectiveInstant, string issued, FhirR4Quantity valueQuantity, FhirR4CodeableConcept valueCodeableConcept, string valueString, bool? valueBoolean, int? valueInteger, FhirR4Range valueRange, FhirR4Ratio valueRatio, FhirR4SampledData valueSampledData, TimeSpan? valueTime, string valueDateTime, FhirR4Period valuePeriod, FhirR4CodeableConcept dataAbsentReason, IList interpretation, IList note, FhirR4CodeableConcept bodySite, FhirR4CodeableConcept method, IList referenceRange, IList hasMember, IList derivedFrom, IList component) : base(resourceType, id, meta, implicitRules, language, additionalProperties, text, contained, extension, modifierExtension) + internal Observation(string resourceType, string id, Meta meta, string implicitRules, string language, IDictionary additionalProperties, Narrative text, IList contained, IList extension, IList modifierExtension, IList identifier, ObservationStatusCodeType status, IList category, CodeableConcept code, Reference subject, Reference encounter, string effectiveDateTime, Period effectivePeriod, string effectiveInstant, string issued, Quantity valueQuantity, CodeableConcept valueCodeableConcept, string valueString, bool? valueBoolean, int? valueInteger, Range valueRange, Ratio valueRatio, SampledData valueSampledData, TimeSpan? valueTime, string valueDateTime, Period valuePeriod, CodeableConcept dataAbsentReason, IList interpretation, IList note, CodeableConcept bodySite, CodeableConcept method, IList referenceRange, IList hasMember, IList derivedFrom, IList component) : base(resourceType, id, meta, implicitRules, language, additionalProperties, text, contained, extension, modifierExtension) { Identifier = identifier; Status = status; @@ -111,35 +111,35 @@ internal FhirR4Observation(string resourceType, string id, FhirR4Meta meta, stri Component = component; } - /// Initializes a new instance of for deserialization. - internal FhirR4Observation() + /// Initializes a new instance of for deserialization. + internal Observation() { } /// Business Identifier for observation. - public IList Identifier { get; } + public IList Identifier { get; } /// registered | preliminary | final | amended +. public ObservationStatusCodeType Status { get; set; } /// Classification of type of observation. - public IList Category { get; } + public IList Category { get; } /// Type of observation (code / type). - public FhirR4CodeableConcept Code { get; set; } + public CodeableConcept Code { get; set; } /// Who and/or what the observation is about. - public FhirR4Reference Subject { get; set; } + public Reference Subject { get; set; } /// Healthcare event during which this observation is made. - public FhirR4Reference Encounter { get; set; } + public Reference Encounter { get; set; } /// Clinically relevant time/time-period for observation. public string EffectiveDateTime { get; set; } /// Clinically relevant time/time-period for observation. - public FhirR4Period EffectivePeriod { get; set; } + public Period EffectivePeriod { get; set; } /// Clinically relevant time/time-period for observation. public string EffectiveInstant { get; set; } /// Date/Time this version was made available. public string Issued { get; set; } /// Actual result. - public FhirR4Quantity ValueQuantity { get; set; } + public Quantity ValueQuantity { get; set; } /// Actual result. - public FhirR4CodeableConcept ValueCodeableConcept { get; set; } + public CodeableConcept ValueCodeableConcept { get; set; } /// Actual result. public string ValueString { get; set; } /// Actual result. @@ -147,34 +147,34 @@ internal FhirR4Observation() /// Actual result. public int? ValueInteger { get; set; } /// Actual result. - public FhirR4Range ValueRange { get; set; } + public Range ValueRange { get; set; } /// Actual result. - public FhirR4Ratio ValueRatio { get; set; } + public Ratio ValueRatio { get; set; } /// Actual result. - public FhirR4SampledData ValueSampledData { get; set; } + public SampledData ValueSampledData { get; set; } /// Actual result. public TimeSpan? ValueTime { get; set; } /// Actual result. public string ValueDateTime { get; set; } /// Actual result. - public FhirR4Period ValuePeriod { get; set; } + public Period ValuePeriod { get; set; } /// Why the result is missing. - public FhirR4CodeableConcept DataAbsentReason { get; set; } + public CodeableConcept DataAbsentReason { get; set; } /// High, low, normal, etc. - public IList Interpretation { get; } + public IList Interpretation { get; } /// Comments about the observation. - public IList Note { get; } + public IList Note { get; } /// Observed body part. - public FhirR4CodeableConcept BodySite { get; set; } + public CodeableConcept BodySite { get; set; } /// How it was done. - public FhirR4CodeableConcept Method { get; set; } + public CodeableConcept Method { get; set; } /// Provides guide for interpretation. - public IList ReferenceRange { get; } + public IList ReferenceRange { get; } /// Related resource that belongs to the Observation group. - public IList HasMember { get; } + public IList HasMember { get; } /// Related measurements the observation is made from. - public IList DerivedFrom { get; } + public IList DerivedFrom { get; } /// Component results. - public IList Component { get; } + public IList Component { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationComponent.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationComponent.Serialization.cs similarity index 73% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationComponent.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationComponent.Serialization.cs index c41e0d527fe72..971d5b7dd431a 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationComponent.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationComponent.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4ObservationComponent : IUtf8JsonSerializable, IJsonModel + public partial class ObservationComponent : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4ObservationComponent)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ObservationComponent)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -146,19 +146,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe writer.WriteEndObject(); } - FhirR4ObservationComponent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + ObservationComponent IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4ObservationComponent)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ObservationComponent)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4ObservationComponent(document.RootElement, options); + return DeserializeObservationComponent(document.RootElement, options); } - internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent(JsonElement element, ModelReaderWriterOptions options = null) + internal static ObservationComponent DeserializeObservationComponent(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -166,31 +166,31 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { return null; } - FhirR4CodeableConcept code = default; - FhirR4Quantity valueQuantity = default; - FhirR4CodeableConcept valueCodeableConcept = default; + CodeableConcept code = default; + Quantity valueQuantity = default; + CodeableConcept valueCodeableConcept = default; string valueString = default; bool? valueBoolean = default; int? valueInteger = default; - FhirR4Range valueRange = default; - FhirR4Ratio valueRatio = default; - FhirR4SampledData valueSampledData = default; + Range valueRange = default; + Ratio valueRatio = default; + SampledData valueSampledData = default; TimeSpan? valueTime = default; string valueDateTime = default; - FhirR4Period valuePeriod = default; - FhirR4Reference valueReference = default; - FhirR4CodeableConcept dataAbsentReason = default; - IList interpretation = default; - IList referenceRange = default; + Period valuePeriod = default; + Reference valueReference = default; + CodeableConcept dataAbsentReason = default; + IList interpretation = default; + IList referenceRange = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("code"u8)) { - code = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + code = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("valueQuantity"u8)) @@ -199,7 +199,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valueQuantity = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + valueQuantity = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("valueCodeableConcept"u8)) @@ -208,7 +208,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valueCodeableConcept = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + valueCodeableConcept = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("valueString"u8)) @@ -240,7 +240,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valueRange = FhirR4Range.DeserializeFhirR4Range(property.Value, options); + valueRange = Range.DeserializeRange(property.Value, options); continue; } if (property.NameEquals("valueRatio"u8)) @@ -249,7 +249,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valueRatio = FhirR4Ratio.DeserializeFhirR4Ratio(property.Value, options); + valueRatio = Ratio.DeserializeRatio(property.Value, options); continue; } if (property.NameEquals("valueSampledData"u8)) @@ -258,7 +258,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valueSampledData = FhirR4SampledData.DeserializeFhirR4SampledData(property.Value, options); + valueSampledData = SampledData.DeserializeSampledData(property.Value, options); continue; } if (property.NameEquals("valueTime"u8)) @@ -281,7 +281,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valuePeriod = FhirR4Period.DeserializeFhirR4Period(property.Value, options); + valuePeriod = Period.DeserializePeriod(property.Value, options); continue; } if (property.NameEquals("valueReference"u8)) @@ -290,7 +290,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - valueReference = FhirR4Reference.DeserializeFhirR4Reference(property.Value, options); + valueReference = Reference.DeserializeReference(property.Value, options); continue; } if (property.NameEquals("dataAbsentReason"u8)) @@ -299,7 +299,7 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - dataAbsentReason = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + dataAbsentReason = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("interpretation"u8)) @@ -308,10 +308,10 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } interpretation = array; continue; @@ -322,10 +322,10 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4ObservationReferenceRange.DeserializeFhirR4ObservationReferenceRange(item, options)); + array.Add(ObservationReferenceRange.DeserializeObservationReferenceRange(item, options)); } referenceRange = array; continue; @@ -341,10 +341,10 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -355,9 +355,9 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4ObservationComponent( + return new ObservationComponent( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, code, valueQuantity, @@ -373,47 +373,47 @@ internal static FhirR4ObservationComponent DeserializeFhirR4ObservationComponent valuePeriod, valueReference, dataAbsentReason, - interpretation ?? new ChangeTrackingList(), - referenceRange ?? new ChangeTrackingList()); + interpretation ?? new ChangeTrackingList(), + referenceRange ?? new ChangeTrackingList()); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4ObservationComponent)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ObservationComponent)} does not support writing '{options.Format}' format."); } } - FhirR4ObservationComponent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + ObservationComponent IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4ObservationComponent(document.RootElement, options); + return DeserializeObservationComponent(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4ObservationComponent)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ObservationComponent)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4ObservationComponent FromResponse(Response response) + internal static new ObservationComponent FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4ObservationComponent(document.RootElement); + return DeserializeObservationComponent(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationComponent.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationComponent.cs similarity index 66% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationComponent.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationComponent.cs index 157424cc6c29f..e6db077962517 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationComponent.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationComponent.cs @@ -14,21 +14,21 @@ namespace Azure.Health.Insights.RadiologyInsights /// Component results /// Based on [FHIR Observation.component](https://www.hl7.org/fhir/R4/observation.html) /// - public partial class FhirR4ObservationComponent : FhirR4Element + public partial class ObservationComponent : Element { - /// Initializes a new instance of . + /// Initializes a new instance of . /// Type of component observation (code / type). /// is null. - public FhirR4ObservationComponent(FhirR4CodeableConcept code) + public ObservationComponent(CodeableConcept code) { Argument.AssertNotNull(code, nameof(code)); Code = code; - Interpretation = new ChangeTrackingList(); - ReferenceRange = new ChangeTrackingList(); + Interpretation = new ChangeTrackingList(); + ReferenceRange = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. @@ -48,7 +48,7 @@ public FhirR4ObservationComponent(FhirR4CodeableConcept code) /// Why the component result is missing. /// High, low, normal, etc. /// Provides guide for interpretation of component result. - internal FhirR4ObservationComponent(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4CodeableConcept code, FhirR4Quantity valueQuantity, FhirR4CodeableConcept valueCodeableConcept, string valueString, bool? valueBoolean, int? valueInteger, FhirR4Range valueRange, FhirR4Ratio valueRatio, FhirR4SampledData valueSampledData, TimeSpan? valueTime, string valueDateTime, FhirR4Period valuePeriod, FhirR4Reference valueReference, FhirR4CodeableConcept dataAbsentReason, IList interpretation, IList referenceRange) : base(id, extension, serializedAdditionalRawData) + internal ObservationComponent(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CodeableConcept code, Quantity valueQuantity, CodeableConcept valueCodeableConcept, string valueString, bool? valueBoolean, int? valueInteger, Range valueRange, Ratio valueRatio, SampledData valueSampledData, TimeSpan? valueTime, string valueDateTime, Period valuePeriod, Reference valueReference, CodeableConcept dataAbsentReason, IList interpretation, IList referenceRange) : base(id, extension, serializedAdditionalRawData) { Code = code; ValueQuantity = valueQuantity; @@ -68,17 +68,17 @@ internal FhirR4ObservationComponent(string id, IReadOnlyList ex ReferenceRange = referenceRange; } - /// Initializes a new instance of for deserialization. - internal FhirR4ObservationComponent() + /// Initializes a new instance of for deserialization. + internal ObservationComponent() { } /// Type of component observation (code / type). - public FhirR4CodeableConcept Code { get; set; } + public CodeableConcept Code { get; set; } /// Value as Quantity. - public FhirR4Quantity ValueQuantity { get; set; } + public Quantity ValueQuantity { get; set; } /// Value as CodeableConcept. - public FhirR4CodeableConcept ValueCodeableConcept { get; set; } + public CodeableConcept ValueCodeableConcept { get; set; } /// Value as string. public string ValueString { get; set; } /// Value as boolean. @@ -86,24 +86,24 @@ internal FhirR4ObservationComponent() /// Value as integer. public int? ValueInteger { get; set; } /// Value as Range. - public FhirR4Range ValueRange { get; set; } + public Range ValueRange { get; set; } /// Value as Ratio. - public FhirR4Ratio ValueRatio { get; set; } + public Ratio ValueRatio { get; set; } /// Value as SampledData. - public FhirR4SampledData ValueSampledData { get; set; } + public SampledData ValueSampledData { get; set; } /// Value as time (hh:mm:ss). public TimeSpan? ValueTime { get; set; } /// Value as dateTime. public string ValueDateTime { get; set; } /// Value as Period. - public FhirR4Period ValuePeriod { get; set; } + public Period ValuePeriod { get; set; } /// Value as reference. - public FhirR4Reference ValueReference { get; set; } + public Reference ValueReference { get; set; } /// Why the component result is missing. - public FhirR4CodeableConcept DataAbsentReason { get; set; } + public CodeableConcept DataAbsentReason { get; set; } /// High, low, normal, etc. - public IList Interpretation { get; } + public IList Interpretation { get; } /// Provides guide for interpretation of component result. - public IList ReferenceRange { get; } + public IList ReferenceRange { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationReferenceRange.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationReferenceRange.Serialization.cs similarity index 66% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationReferenceRange.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationReferenceRange.Serialization.cs index 46f06995701da..1d5724cd98242 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationReferenceRange.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationReferenceRange.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4ObservationReferenceRange : IUtf8JsonSerializable, IJsonModel + public partial class ObservationReferenceRange : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4ObservationReferenceRange)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ObservationReferenceRange)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -79,19 +79,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteEndObject(); } - FhirR4ObservationReferenceRange IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + ObservationReferenceRange IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4ObservationReferenceRange)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ObservationReferenceRange)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4ObservationReferenceRange(document.RootElement, options); + return DeserializeObservationReferenceRange(document.RootElement, options); } - internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationReferenceRange(JsonElement element, ModelReaderWriterOptions options = null) + internal static ObservationReferenceRange DeserializeObservationReferenceRange(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -99,11 +99,11 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe { return null; } - FhirR4Quantity low = default; - FhirR4Quantity high = default; - FhirR4CodeableConcept type = default; - IList appliesTo = default; - FhirR4Range age = default; + Quantity low = default; + Quantity high = default; + CodeableConcept type = default; + IList appliesTo = default; + Range age = default; string text = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); @@ -115,7 +115,7 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe { continue; } - low = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + low = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("high"u8)) @@ -124,7 +124,7 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe { continue; } - high = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + high = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("type"u8)) @@ -133,7 +133,7 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe { continue; } - type = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + type = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("appliesTo"u8)) @@ -142,10 +142,10 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } appliesTo = array; continue; @@ -156,7 +156,7 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe { continue; } - age = FhirR4Range.DeserializeFhirR4Range(property.Value, options); + age = Range.DeserializeRange(property.Value, options); continue; } if (property.NameEquals("text"u8)) @@ -170,53 +170,53 @@ internal static FhirR4ObservationReferenceRange DeserializeFhirR4ObservationRefe } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4ObservationReferenceRange( + return new ObservationReferenceRange( low, high, type, - appliesTo ?? new ChangeTrackingList(), + appliesTo ?? new ChangeTrackingList(), age, text, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4ObservationReferenceRange)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ObservationReferenceRange)} does not support writing '{options.Format}' format."); } } - FhirR4ObservationReferenceRange IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + ObservationReferenceRange IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4ObservationReferenceRange(document.RootElement, options); + return DeserializeObservationReferenceRange(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4ObservationReferenceRange)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ObservationReferenceRange)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static FhirR4ObservationReferenceRange FromResponse(Response response) + internal static ObservationReferenceRange FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4ObservationReferenceRange(document.RootElement); + return DeserializeObservationReferenceRange(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationReferenceRange.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationReferenceRange.cs similarity index 77% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationReferenceRange.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationReferenceRange.cs index 4503fce75e6b7..36ff006331006 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4ObservationReferenceRange.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/ObservationReferenceRange.cs @@ -14,7 +14,7 @@ namespace Azure.Health.Insights.RadiologyInsights /// Provides guide for interpretation of component result /// Based on [FHIR Observation.referenceRange](https://www.hl7.org/fhir/R4/observation.html) /// - public partial class FhirR4ObservationReferenceRange + public partial class ObservationReferenceRange { /// /// Keeps track of any properties unknown to the library. @@ -48,13 +48,13 @@ public partial class FhirR4ObservationReferenceRange /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public FhirR4ObservationReferenceRange() + /// Initializes a new instance of . + public ObservationReferenceRange() { - AppliesTo = new ChangeTrackingList(); + AppliesTo = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Low Range, if relevant. /// High Range, if relevant. /// Reference range qualifier. @@ -62,7 +62,7 @@ public FhirR4ObservationReferenceRange() /// Applicable age range, if relevant. /// Text based reference range in an observation. /// Keeps track of any properties unknown to the library. - internal FhirR4ObservationReferenceRange(FhirR4Quantity low, FhirR4Quantity high, FhirR4CodeableConcept type, IList appliesTo, FhirR4Range age, string text, IDictionary serializedAdditionalRawData) + internal ObservationReferenceRange(Quantity low, Quantity high, CodeableConcept type, IList appliesTo, Range age, string text, IDictionary serializedAdditionalRawData) { Low = low; High = high; @@ -74,15 +74,15 @@ internal FhirR4ObservationReferenceRange(FhirR4Quantity low, FhirR4Quantity high } /// Low Range, if relevant. - public FhirR4Quantity Low { get; set; } + public Quantity Low { get; set; } /// High Range, if relevant. - public FhirR4Quantity High { get; set; } + public Quantity High { get; set; } /// Reference range qualifier. - public FhirR4CodeableConcept Type { get; set; } + public CodeableConcept Type { get; set; } /// Reference range population. - public IList AppliesTo { get; } + public IList AppliesTo { get; } /// Applicable age range, if relevant. - public FhirR4Range Age { get; set; } + public Range Age { get; set; } /// Text based reference range in an observation. public string Text { get; set; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.Serialization.cs index fb95e1fa94d91..338fa1ebe195b 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.Serialization.cs @@ -84,8 +84,8 @@ internal static OrderedProcedure DeserializeOrderedProcedure(JsonElement element { return null; } - IList extension = default; - FhirR4CodeableConcept code = default; + IList extension = default; + CodeableConcept code = default; string description = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); @@ -97,10 +97,10 @@ internal static OrderedProcedure DeserializeOrderedProcedure(JsonElement element { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -111,7 +111,7 @@ internal static OrderedProcedure DeserializeOrderedProcedure(JsonElement element { continue; } - code = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + code = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("description"u8)) @@ -125,7 +125,7 @@ internal static OrderedProcedure DeserializeOrderedProcedure(JsonElement element } } serializedAdditionalRawData = rawDataDictionary; - return new OrderedProcedure(extension ?? new ChangeTrackingList(), code, description, serializedAdditionalRawData); + return new OrderedProcedure(extension ?? new ChangeTrackingList(), code, description, serializedAdditionalRawData); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.cs index d113b17e99b7f..4657e991dad8e 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/OrderedProcedure.cs @@ -48,7 +48,7 @@ public partial class OrderedProcedure /// Initializes a new instance of . public OrderedProcedure() { - Extension = new ChangeTrackingList(); + Extension = new ChangeTrackingList(); } /// Initializes a new instance of . @@ -56,7 +56,7 @@ public OrderedProcedure() /// Procedure code. /// Procedure description. /// Keeps track of any properties unknown to the library. - internal OrderedProcedure(IList extension, FhirR4CodeableConcept code, string description, IDictionary serializedAdditionalRawData) + internal OrderedProcedure(IList extension, CodeableConcept code, string description, IDictionary serializedAdditionalRawData) { Extension = extension; Code = code; @@ -65,9 +65,9 @@ internal OrderedProcedure(IList extension, FhirR4CodeableConcep } /// Additional Content defined by implementations. - public IList Extension { get; } + public IList Extension { get; } /// Procedure code. - public FhirR4CodeableConcept Code { get; set; } + public CodeableConcept Code { get; set; } /// Procedure description. public string Description { get; set; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientDetails.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientInfo.Serialization.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientDetails.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientInfo.Serialization.cs index 1bd7233c429f8..9b980a60fca28 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientDetails.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientInfo.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class PatientDetails : IUtf8JsonSerializable, IJsonModel + public partial class PatientInfo : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(PatientDetails)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(PatientInfo)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -64,19 +64,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp writer.WriteEndObject(); } - PatientDetails IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + PatientInfo IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(PatientDetails)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(PatientInfo)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializePatientDetails(document.RootElement, options); + return DeserializePatientInfo(document.RootElement, options); } - internal static PatientDetails DeserializePatientDetails(JsonElement element, ModelReaderWriterOptions options = null) + internal static PatientInfo DeserializePatientInfo(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -86,7 +86,7 @@ internal static PatientDetails DeserializePatientDetails(JsonElement element, Mo } PatientSex? sex = default; DateTimeOffset? birthDate = default; - IList clinicalInfo = default; + IList clinicalInfo = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -115,10 +115,10 @@ internal static PatientDetails DeserializePatientDetails(JsonElement element, Mo { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Resource.DeserializeFhirR4Resource(item, options)); + array.Add(Resource.DeserializeResource(item, options)); } clinicalInfo = array; continue; @@ -129,46 +129,46 @@ internal static PatientDetails DeserializePatientDetails(JsonElement element, Mo } } serializedAdditionalRawData = rawDataDictionary; - return new PatientDetails(sex, birthDate, clinicalInfo ?? new ChangeTrackingList(), serializedAdditionalRawData); + return new PatientInfo(sex, birthDate, clinicalInfo ?? new ChangeTrackingList(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(PatientDetails)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(PatientInfo)} does not support writing '{options.Format}' format."); } } - PatientDetails IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + PatientInfo IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializePatientDetails(document.RootElement, options); + return DeserializePatientInfo(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(PatientDetails)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(PatientInfo)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static PatientDetails FromResponse(Response response) + internal static PatientInfo FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializePatientDetails(document.RootElement); + return DeserializePatientInfo(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientDetails.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientInfo.cs similarity index 86% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientDetails.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientInfo.cs index e225909cb088c..6c6e497160fd0 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientDetails.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientInfo.cs @@ -11,7 +11,7 @@ namespace Azure.Health.Insights.RadiologyInsights { /// Patient structured information, including demographics and known structured clinical information. - public partial class PatientDetails + public partial class PatientInfo { /// /// Keeps track of any properties unknown to the library. @@ -45,18 +45,18 @@ public partial class PatientDetails /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public PatientDetails() + /// Initializes a new instance of . + public PatientInfo() { - ClinicalInfo = new ChangeTrackingList(); + ClinicalInfo = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The patient's sex. /// The patient's date of birth. /// Known clinical information for the patient, structured. /// Keeps track of any properties unknown to the library. - internal PatientDetails(PatientSex? sex, DateTimeOffset? birthDate, IList clinicalInfo, IDictionary serializedAdditionalRawData) + internal PatientInfo(PatientSex? sex, DateTimeOffset? birthDate, IList clinicalInfo, IDictionary serializedAdditionalRawData) { Sex = sex; BirthDate = birthDate; @@ -69,6 +69,6 @@ internal PatientDetails(PatientSex? sex, DateTimeOffset? birthDate, IList The patient's date of birth. public DateTimeOffset? BirthDate { get; set; } /// Known clinical information for the patient, structured. - public IList ClinicalInfo { get; } + public IList ClinicalInfo { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.Serialization.cs index 96ecb07f11edf..0ce0894f04833 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.Serialization.cs @@ -92,7 +92,7 @@ internal static PatientRecord DeserializePatientRecord(JsonElement element, Mode return null; } string id = default; - PatientDetails info = default; + PatientInfo info = default; IList encounters = default; IList patientDocuments = default; IDictionary serializedAdditionalRawData = default; @@ -110,7 +110,7 @@ internal static PatientRecord DeserializePatientRecord(JsonElement element, Mode { continue; } - info = PatientDetails.DeserializePatientDetails(property.Value, options); + info = PatientInfo.DeserializePatientInfo(property.Value, options); continue; } if (property.NameEquals("encounters"u8)) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.cs index f3b508142ca19..95fec6bc97137 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/PatientRecord.cs @@ -63,7 +63,7 @@ public PatientRecord(string id) /// Patient encounters/visits. /// Patient unstructured clinical data, given as documents. /// Keeps track of any properties unknown to the library. - internal PatientRecord(string id, PatientDetails info, IList encounters, IList patientDocuments, IDictionary serializedAdditionalRawData) + internal PatientRecord(string id, PatientInfo info, IList encounters, IList patientDocuments, IDictionary serializedAdditionalRawData) { Id = id; Info = info; @@ -80,7 +80,7 @@ internal PatientRecord() /// A given identifier for the patient. Has to be unique across all patients in a single request. public string Id { get; } /// Patient structured information, including demographics and known structured clinical information. - public PatientDetails Info { get; set; } + public PatientInfo Info { get; set; } /// Patient encounters/visits. public IList Encounters { get; } /// Patient unstructured clinical data, given as documents. diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Period.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Period.Serialization.cs similarity index 70% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Period.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Period.Serialization.cs index 157dd73664fd7..7fbe1cf6ffa71 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Period.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Period.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Period : IUtf8JsonSerializable, IJsonModel + public partial class Period : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Period)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Period)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -69,19 +69,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpti writer.WriteEndObject(); } - FhirR4Period IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Period IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Period)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Period)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Period(document.RootElement, options); + return DeserializePeriod(document.RootElement, options); } - internal static FhirR4Period DeserializeFhirR4Period(JsonElement element, ModelReaderWriterOptions options = null) + internal static Period DeserializePeriod(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -92,7 +92,7 @@ internal static FhirR4Period DeserializeFhirR4Period(JsonElement element, ModelR string start = default; string end = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -118,10 +118,10 @@ internal static FhirR4Period DeserializeFhirR4Period(JsonElement element, ModelR { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -132,46 +132,46 @@ internal static FhirR4Period DeserializeFhirR4Period(JsonElement element, ModelR } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Period(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, start, end); + return new Period(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, start, end); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Period)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Period)} does not support writing '{options.Format}' format."); } } - FhirR4Period IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Period IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Period(document.RootElement, options); + return DeserializePeriod(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Period)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Period)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Period FromResponse(Response response) + internal static new Period FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Period(document.RootElement); + return DeserializePeriod(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Period.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Period.cs similarity index 71% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Period.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Period.cs index c1e2d6ebbc572..8b5175113ba82 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Period.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Period.cs @@ -14,20 +14,20 @@ namespace Azure.Health.Insights.RadiologyInsights /// A time period defined by a start and end date and optionally time /// Based on [FHIR Period](https://www.hl7.org/fhir/R4/datatypes.html#Period) /// - public partial class FhirR4Period : FhirR4Element + public partial class Period : Element { - /// Initializes a new instance of . - public FhirR4Period() + /// Initializes a new instance of . + public Period() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Starting time with inclusive boundary. /// End time with inclusive boundary, if not ongoing. - internal FhirR4Period(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string start, string end) : base(id, extension, serializedAdditionalRawData) + internal Period(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string start, string end) : base(id, extension, serializedAdditionalRawData) { Start = start; End = end; diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Quantity.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Quantity.Serialization.cs similarity index 75% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Quantity.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Quantity.Serialization.cs index afba1e017af86..8d4529317034c 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Quantity.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Quantity.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Quantity : IUtf8JsonSerializable, IJsonModel + public partial class Quantity : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Quantity)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Quantity)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -84,19 +84,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp writer.WriteEndObject(); } - FhirR4Quantity IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Quantity IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Quantity)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Quantity)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Quantity(document.RootElement, options); + return DeserializeQuantity(document.RootElement, options); } - internal static FhirR4Quantity DeserializeFhirR4Quantity(JsonElement element, ModelReaderWriterOptions options = null) + internal static Quantity DeserializeQuantity(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -110,7 +110,7 @@ internal static FhirR4Quantity DeserializeFhirR4Quantity(JsonElement element, Mo string system = default; string code = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -155,10 +155,10 @@ internal static FhirR4Quantity DeserializeFhirR4Quantity(JsonElement element, Mo { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -169,9 +169,9 @@ internal static FhirR4Quantity DeserializeFhirR4Quantity(JsonElement element, Mo } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Quantity( + return new Quantity( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, value, comparator, @@ -180,43 +180,43 @@ internal static FhirR4Quantity DeserializeFhirR4Quantity(JsonElement element, Mo code); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Quantity)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Quantity)} does not support writing '{options.Format}' format."); } } - FhirR4Quantity IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Quantity IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Quantity(document.RootElement, options); + return DeserializeQuantity(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Quantity)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Quantity)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Quantity FromResponse(Response response) + internal static new Quantity FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Quantity(document.RootElement); + return DeserializeQuantity(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Quantity.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Quantity.cs similarity index 77% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Quantity.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Quantity.cs index 1540721f3f337..7ef2bd79feab0 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Quantity.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Quantity.cs @@ -14,14 +14,14 @@ namespace Azure.Health.Insights.RadiologyInsights /// A measured or measurable amount /// Based on [FHIR Quantity](https://www.hl7.org/fhir/R4/datatypes.html#Quantity) /// - public partial class FhirR4Quantity : FhirR4Element + public partial class Quantity : Element { - /// Initializes a new instance of . - public FhirR4Quantity() + /// Initializes a new instance of . + public Quantity() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. @@ -30,7 +30,7 @@ public FhirR4Quantity() /// Unit representation. /// System that defines coded unit form. /// Coded form of the unit. - internal FhirR4Quantity(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, double? value, string comparator, string unit, string system, string code) : base(id, extension, serializedAdditionalRawData) + internal Quantity(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, double? value, string comparator, string unit, string system, string code) : base(id, extension, serializedAdditionalRawData) { Value = value; Comparator = comparator; diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.Serialization.cs index 29c228a91341c..43598a8336ef1 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.Serialization.cs @@ -73,23 +73,23 @@ internal static RadiologyCodeWithTypes DeserializeRadiologyCodeWithTypes(JsonEle { return null; } - FhirR4CodeableConcept code = default; - IReadOnlyList types = default; + CodeableConcept code = default; + IReadOnlyList types = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("code"u8)) { - code = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + code = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("types"u8)) { - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } types = array; continue; diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.cs index 4aa1d4224cd3a..b5c888bcd7198 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyCodeWithTypes.cs @@ -50,7 +50,7 @@ public partial class RadiologyCodeWithTypes /// The SNOMED CT code indicates whether imaging was conducted with or without contrast in the case of contrast, and in the case of views, it denotes the number of views. /// The collection of types will indicate the contrast substance used in the case of contrast and, in the case of views, it will specify the types of views, such as lateral and frontal, etc. /// or is null. - internal RadiologyCodeWithTypes(FhirR4CodeableConcept code, IEnumerable types) + internal RadiologyCodeWithTypes(CodeableConcept code, IEnumerable types) { Argument.AssertNotNull(code, nameof(code)); Argument.AssertNotNull(types, nameof(types)); @@ -63,7 +63,7 @@ internal RadiologyCodeWithTypes(FhirR4CodeableConcept code, IEnumerable The SNOMED CT code indicates whether imaging was conducted with or without contrast in the case of contrast, and in the case of views, it denotes the number of views. /// The collection of types will indicate the contrast substance used in the case of contrast and, in the case of views, it will specify the types of views, such as lateral and frontal, etc. /// Keeps track of any properties unknown to the library. - internal RadiologyCodeWithTypes(FhirR4CodeableConcept code, IReadOnlyList types, IDictionary serializedAdditionalRawData) + internal RadiologyCodeWithTypes(CodeableConcept code, IReadOnlyList types, IDictionary serializedAdditionalRawData) { Code = code; Types = types; @@ -76,8 +76,8 @@ internal RadiologyCodeWithTypes() } /// The SNOMED CT code indicates whether imaging was conducted with or without contrast in the case of contrast, and in the case of views, it denotes the number of views. - public FhirR4CodeableConcept Code { get; } + public CodeableConcept Code { get; } /// The collection of types will indicate the contrast substance used in the case of contrast and, in the case of views, it will specify the types of views, such as lateral and frontal, etc. - public IReadOnlyList Types { get; } + public IReadOnlyList Types { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyInsightsInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyInsightsInference.cs index 24c1312c6cbda..0a07a85a04935 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyInsightsInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyInsightsInference.cs @@ -62,14 +62,14 @@ public abstract partial class RadiologyInsightsInference /// Initializes a new instance of . protected RadiologyInsightsInference() { - Extension = new ChangeTrackingList(); + Extension = new ChangeTrackingList(); } /// Initializes a new instance of . /// Discriminator. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. - internal RadiologyInsightsInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData) + internal RadiologyInsightsInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData) { Kind = kind; Extension = extension; @@ -79,6 +79,6 @@ internal RadiologyInsightsInference(string kind, IReadOnlyList /// Discriminator. internal string Kind { get; set; } /// Additional Content defined by implementations. - public IReadOnlyList Extension { get; } + public IReadOnlyList Extension { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.Serialization.cs index cc666587fe95e..c3b58cdfbd27e 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.Serialization.cs @@ -95,11 +95,11 @@ internal static RadiologyProcedureInference DeserializeRadiologyProcedureInferen { return null; } - IReadOnlyList procedureCodes = default; + IReadOnlyList procedureCodes = default; IReadOnlyList imagingProcedures = default; OrderedProcedure orderedProcedure = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -110,10 +110,10 @@ internal static RadiologyProcedureInference DeserializeRadiologyProcedureInferen { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(item, options)); + array.Add(CodeableConcept.DeserializeCodeableConcept(item, options)); } procedureCodes = array; continue; @@ -144,10 +144,10 @@ internal static RadiologyProcedureInference DeserializeRadiologyProcedureInferen { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -160,9 +160,9 @@ internal static RadiologyProcedureInference DeserializeRadiologyProcedureInferen serializedAdditionalRawData = rawDataDictionary; return new RadiologyProcedureInference( kind, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, - procedureCodes ?? new ChangeTrackingList(), + procedureCodes ?? new ChangeTrackingList(), imagingProcedures, orderedProcedure); } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.cs index beace6219d876..0caa9c21a5cd5 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RadiologyProcedureInference.cs @@ -24,7 +24,7 @@ internal RadiologyProcedureInference(IEnumerable imagingProced Argument.AssertNotNull(orderedProcedure, nameof(orderedProcedure)); Kind = "radiologyProcedure"; - ProcedureCodes = new ChangeTrackingList(); + ProcedureCodes = new ChangeTrackingList(); ImagingProcedures = imagingProcedures.ToList(); OrderedProcedure = orderedProcedure; } @@ -36,7 +36,7 @@ internal RadiologyProcedureInference(IEnumerable imagingProced /// LOINC codes for the procedure. /// Imaging procedures. /// Ordered procedure information from the document information or text. - internal RadiologyProcedureInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, IReadOnlyList procedureCodes, IReadOnlyList imagingProcedures, OrderedProcedure orderedProcedure) : base(kind, extension, serializedAdditionalRawData) + internal RadiologyProcedureInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, IReadOnlyList procedureCodes, IReadOnlyList imagingProcedures, OrderedProcedure orderedProcedure) : base(kind, extension, serializedAdditionalRawData) { ProcedureCodes = procedureCodes; ImagingProcedures = imagingProcedures; @@ -49,7 +49,7 @@ internal RadiologyProcedureInference() } /// LOINC codes for the procedure. - public IReadOnlyList ProcedureCodes { get; } + public IReadOnlyList ProcedureCodes { get; } /// Imaging procedures. public IReadOnlyList ImagingProcedures { get; } /// Ordered procedure information from the document information or text. diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Range.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Range.Serialization.cs similarity index 69% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Range.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Range.Serialization.cs index 7f7c6745d809a..91bde8554ba32 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Range.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Range.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Range : IUtf8JsonSerializable, IJsonModel + public partial class Range : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Range)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Range)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -69,19 +69,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptio writer.WriteEndObject(); } - FhirR4Range IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Range IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Range)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Range)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Range(document.RootElement, options); + return DeserializeRange(document.RootElement, options); } - internal static FhirR4Range DeserializeFhirR4Range(JsonElement element, ModelReaderWriterOptions options = null) + internal static Range DeserializeRange(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -89,10 +89,10 @@ internal static FhirR4Range DeserializeFhirR4Range(JsonElement element, ModelRea { return null; } - FhirR4Quantity low = default; - FhirR4Quantity high = default; + Quantity low = default; + Quantity high = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -103,7 +103,7 @@ internal static FhirR4Range DeserializeFhirR4Range(JsonElement element, ModelRea { continue; } - low = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + low = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("high"u8)) @@ -112,7 +112,7 @@ internal static FhirR4Range DeserializeFhirR4Range(JsonElement element, ModelRea { continue; } - high = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + high = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("id"u8)) @@ -126,10 +126,10 @@ internal static FhirR4Range DeserializeFhirR4Range(JsonElement element, ModelRea { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -140,46 +140,46 @@ internal static FhirR4Range DeserializeFhirR4Range(JsonElement element, ModelRea } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Range(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, low, high); + return new Range(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, low, high); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Range)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Range)} does not support writing '{options.Format}' format."); } } - FhirR4Range IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Range IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Range(document.RootElement, options); + return DeserializeRange(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Range)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Range)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Range FromResponse(Response response) + internal static new Range FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Range(document.RootElement); + return DeserializeRange(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Range.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Range.cs similarity index 63% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Range.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Range.cs index d4c694685dba8..4210e2f7f1341 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Range.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Range.cs @@ -14,28 +14,28 @@ namespace Azure.Health.Insights.RadiologyInsights /// A set of ordered Quantities defined by a low and high limit /// Based on [FHIR Range](https://www.hl7.org/fhir/R4/datatypes.html#Range) /// - public partial class FhirR4Range : FhirR4Element + public partial class Range : Element { - /// Initializes a new instance of . - public FhirR4Range() + /// Initializes a new instance of . + public Range() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Low limit. /// High limit. - internal FhirR4Range(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4Quantity low, FhirR4Quantity high) : base(id, extension, serializedAdditionalRawData) + internal Range(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, Quantity low, Quantity high) : base(id, extension, serializedAdditionalRawData) { Low = low; High = high; } /// Low limit. - public FhirR4Quantity Low { get; set; } + public Quantity Low { get; set; } /// High limit. - public FhirR4Quantity High { get; set; } + public Quantity High { get; set; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Ratio.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Ratio.Serialization.cs similarity index 69% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Ratio.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Ratio.Serialization.cs index 6c680541ee3e5..21c094c61428d 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Ratio.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Ratio.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Ratio : IUtf8JsonSerializable, IJsonModel + public partial class Ratio : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Ratio)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Ratio)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -69,19 +69,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptio writer.WriteEndObject(); } - FhirR4Ratio IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Ratio IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Ratio)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Ratio)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Ratio(document.RootElement, options); + return DeserializeRatio(document.RootElement, options); } - internal static FhirR4Ratio DeserializeFhirR4Ratio(JsonElement element, ModelReaderWriterOptions options = null) + internal static Ratio DeserializeRatio(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -89,10 +89,10 @@ internal static FhirR4Ratio DeserializeFhirR4Ratio(JsonElement element, ModelRea { return null; } - FhirR4Quantity numerator = default; - FhirR4Quantity denominator = default; + Quantity numerator = default; + Quantity denominator = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -103,7 +103,7 @@ internal static FhirR4Ratio DeserializeFhirR4Ratio(JsonElement element, ModelRea { continue; } - numerator = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + numerator = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("denominator"u8)) @@ -112,7 +112,7 @@ internal static FhirR4Ratio DeserializeFhirR4Ratio(JsonElement element, ModelRea { continue; } - denominator = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + denominator = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("id"u8)) @@ -126,10 +126,10 @@ internal static FhirR4Ratio DeserializeFhirR4Ratio(JsonElement element, ModelRea { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -140,46 +140,46 @@ internal static FhirR4Ratio DeserializeFhirR4Ratio(JsonElement element, ModelRea } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Ratio(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, numerator, denominator); + return new Ratio(id, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, numerator, denominator); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Ratio)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Ratio)} does not support writing '{options.Format}' format."); } } - FhirR4Ratio IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Ratio IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Ratio(document.RootElement, options); + return DeserializeRatio(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Ratio)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Ratio)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Ratio FromResponse(Response response) + internal static new Ratio FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Ratio(document.RootElement); + return DeserializeRatio(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Ratio.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Ratio.cs similarity index 63% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Ratio.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Ratio.cs index 65078b702198f..25001975307ab 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Ratio.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Ratio.cs @@ -14,28 +14,28 @@ namespace Azure.Health.Insights.RadiologyInsights /// A ratio of two Quantity values - a numerator and a denominator /// Based on [FHIR Ratio](https://www.hl7.org/fhir/R4/datatypes.html#Ratio) /// - public partial class FhirR4Ratio : FhirR4Element + public partial class Ratio : Element { - /// Initializes a new instance of . - public FhirR4Ratio() + /// Initializes a new instance of . + public Ratio() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Numerator value. /// Denominator value. - internal FhirR4Ratio(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4Quantity numerator, FhirR4Quantity denominator) : base(id, extension, serializedAdditionalRawData) + internal Ratio(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, Quantity numerator, Quantity denominator) : base(id, extension, serializedAdditionalRawData) { Numerator = numerator; Denominator = denominator; } /// Numerator value. - public FhirR4Quantity Numerator { get; set; } + public Quantity Numerator { get; set; } /// Denominator value. - public FhirR4Quantity Denominator { get; set; } + public Quantity Denominator { get; set; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.Serialization.cs index 574aca71e024d..6f832adf09498 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.Serialization.cs @@ -86,8 +86,8 @@ internal static RecommendationFinding DeserializeRecommendationFinding(JsonEleme { return null; } - IReadOnlyList extension = default; - FhirR4Observation finding = default; + IReadOnlyList extension = default; + Observation finding = default; CriticalResult criticalFinding = default; RecommendationFindingStatusType recommendationFindingStatus = default; IDictionary serializedAdditionalRawData = default; @@ -100,10 +100,10 @@ internal static RecommendationFinding DeserializeRecommendationFinding(JsonEleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -114,7 +114,7 @@ internal static RecommendationFinding DeserializeRecommendationFinding(JsonEleme { continue; } - finding = FhirR4Observation.DeserializeFhirR4Observation(property.Value, options); + finding = Observation.DeserializeObservation(property.Value, options); continue; } if (property.NameEquals("criticalFinding"u8)) @@ -137,7 +137,7 @@ internal static RecommendationFinding DeserializeRecommendationFinding(JsonEleme } } serializedAdditionalRawData = rawDataDictionary; - return new RecommendationFinding(extension ?? new ChangeTrackingList(), finding, criticalFinding, recommendationFindingStatus, serializedAdditionalRawData); + return new RecommendationFinding(extension ?? new ChangeTrackingList(), finding, criticalFinding, recommendationFindingStatus, serializedAdditionalRawData); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.cs index 220441846a9da..52a9f302f8841 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/RecommendationFinding.cs @@ -49,7 +49,7 @@ public partial class RecommendationFinding /// Recommendation finding status. internal RecommendationFinding(RecommendationFindingStatusType recommendationFindingStatus) { - Extension = new ChangeTrackingList(); + Extension = new ChangeTrackingList(); RecommendationFindingStatus = recommendationFindingStatus; } @@ -59,7 +59,7 @@ internal RecommendationFinding(RecommendationFindingStatusType recommendationFin /// Critical result linked to a recommendation. /// Recommendation finding status. /// Keeps track of any properties unknown to the library. - internal RecommendationFinding(IReadOnlyList extension, FhirR4Observation finding, CriticalResult criticalFinding, RecommendationFindingStatusType recommendationFindingStatus, IDictionary serializedAdditionalRawData) + internal RecommendationFinding(IReadOnlyList extension, Observation finding, CriticalResult criticalFinding, RecommendationFindingStatusType recommendationFindingStatus, IDictionary serializedAdditionalRawData) { Extension = extension; Finding = finding; @@ -74,9 +74,9 @@ internal RecommendationFinding() } /// Additional Content defined by implementations. - public IReadOnlyList Extension { get; } + public IReadOnlyList Extension { get; } /// Finding linked to a recommendation. - public FhirR4Observation Finding { get; } + public Observation Finding { get; } /// Critical result linked to a recommendation. public CriticalResult CriticalFinding { get; } /// Recommendation finding status. diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Reference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Reference.Serialization.cs similarity index 71% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Reference.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Reference.Serialization.cs index 28b0930eff8b5..09bcf30fb65fc 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Reference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Reference.Serialization.cs @@ -13,23 +13,23 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Reference : IUtf8JsonSerializable, IJsonModel + public partial class Reference : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Reference)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Reference)} does not support writing '{format}' format."); } writer.WriteStartObject(); - if (Optional.IsDefined(Reference)) + if (Optional.IsDefined(ReferenceProperty)) { writer.WritePropertyName("reference"u8); - writer.WriteStringValue(Reference); + writer.WriteStringValue(ReferenceProperty); } if (Optional.IsDefined(Type)) { @@ -79,19 +79,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO writer.WriteEndObject(); } - FhirR4Reference IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Reference IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Reference)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Reference)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Reference(document.RootElement, options); + return DeserializeReference(document.RootElement, options); } - internal static FhirR4Reference DeserializeFhirR4Reference(JsonElement element, ModelReaderWriterOptions options = null) + internal static Reference DeserializeReference(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -101,10 +101,10 @@ internal static FhirR4Reference DeserializeFhirR4Reference(JsonElement element, } string reference = default; string type = default; - FhirR4Identifier identifier = default; + Identifier identifier = default; string display = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -125,7 +125,7 @@ internal static FhirR4Reference DeserializeFhirR4Reference(JsonElement element, { continue; } - identifier = FhirR4Identifier.DeserializeFhirR4Identifier(property.Value, options); + identifier = Identifier.DeserializeIdentifier(property.Value, options); continue; } if (property.NameEquals("display"u8)) @@ -144,10 +144,10 @@ internal static FhirR4Reference DeserializeFhirR4Reference(JsonElement element, { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -158,9 +158,9 @@ internal static FhirR4Reference DeserializeFhirR4Reference(JsonElement element, } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4Reference( + return new Reference( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, reference, type, @@ -168,43 +168,43 @@ internal static FhirR4Reference DeserializeFhirR4Reference(JsonElement element, display); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Reference)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Reference)} does not support writing '{options.Format}' format."); } } - FhirR4Reference IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Reference IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Reference(document.RootElement, options); + return DeserializeReference(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Reference)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Reference)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4Reference FromResponse(Response response) + internal static new Reference FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Reference(document.RootElement); + return DeserializeReference(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Reference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Reference.cs similarity index 65% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Reference.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Reference.cs index 793da4e76f9fb..a4c640d3b3ae1 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Reference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Reference.cs @@ -14,35 +14,35 @@ namespace Azure.Health.Insights.RadiologyInsights /// A reference from one resource to another /// Based on [FHIR Reference](https://www.hl7.org/fhir/R4/references.html) /// - public partial class FhirR4Reference : FhirR4Element + public partial class Reference : Element { - /// Initializes a new instance of . - public FhirR4Reference() + /// Initializes a new instance of . + public Reference() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. - /// Literal reference, Relative, internal or absolute URL. + /// Literal reference, Relative, internal or absolute URL. /// Type the reference refers to (e.g. "Patient"). /// Logical reference, when literal reference is not known. /// Text alternative for the resource. - internal FhirR4Reference(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string reference, string type, FhirR4Identifier identifier, string display) : base(id, extension, serializedAdditionalRawData) + internal Reference(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, string referenceProperty, string type, Identifier identifier, string display) : base(id, extension, serializedAdditionalRawData) { - Reference = reference; + ReferenceProperty = referenceProperty; Type = type; Identifier = identifier; Display = display; } /// Literal reference, Relative, internal or absolute URL. - public string Reference { get; set; } + public string ReferenceProperty { get; set; } /// Type the reference refers to (e.g. "Patient"). public string Type { get; set; } /// Logical reference, when literal reference is not known. - public FhirR4Identifier Identifier { get; set; } + public Identifier Identifier { get; set; } /// Text alternative for the resource. public string Display { get; set; } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Resource.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Resource.Serialization.cs similarity index 72% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Resource.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Resource.Serialization.cs index bda982f80231f..739f26b8b6ed4 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Resource.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Resource.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4Resource : IUtf8JsonSerializable, IJsonModel + public partial class Resource : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Resource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Resource)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -63,19 +63,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp writer.WriteEndObject(); } - FhirR4Resource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + Resource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4Resource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Resource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4Resource(document.RootElement, options); + return DeserializeResource(document.RootElement, options); } - internal static FhirR4Resource DeserializeFhirR4Resource(JsonElement element, ModelReaderWriterOptions options = null) + internal static Resource DeserializeResource(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -85,7 +85,7 @@ internal static FhirR4Resource DeserializeFhirR4Resource(JsonElement element, Mo } string resourceType = default; string id = default; - FhirR4Meta meta = default; + Meta meta = default; string implicitRules = default; string language = default; IDictionary additionalProperties = default; @@ -108,7 +108,7 @@ internal static FhirR4Resource DeserializeFhirR4Resource(JsonElement element, Mo { continue; } - meta = FhirR4Meta.DeserializeFhirR4Meta(property.Value, options); + meta = Meta.DeserializeMeta(property.Value, options); continue; } if (property.NameEquals("implicitRules"u8)) @@ -124,7 +124,7 @@ internal static FhirR4Resource DeserializeFhirR4Resource(JsonElement element, Mo additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new FhirR4Resource( + return new Resource( resourceType, id, meta, @@ -133,43 +133,43 @@ internal static FhirR4Resource DeserializeFhirR4Resource(JsonElement element, Mo additionalProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4Resource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Resource)} does not support writing '{options.Format}' format."); } } - FhirR4Resource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + Resource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4Resource(document.RootElement, options); + return DeserializeResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4Resource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Resource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static FhirR4Resource FromResponse(Response response) + internal static Resource FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4Resource(document.RootElement); + return DeserializeResource(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Resource.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Resource.cs similarity index 84% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Resource.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Resource.cs index 0111898595c98..9c6c9a9c7a63c 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4Resource.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/Resource.cs @@ -14,12 +14,12 @@ namespace Azure.Health.Insights.RadiologyInsights /// Resource is the ancestor of DomainResource from which most resources are derived. Bundle, Parameters, and Binary extend Resource directly. /// Based on [FHIR Resource](https://www.hl7.org/fhir/r4/resource.html /// - public partial class FhirR4Resource + public partial class Resource { - /// Initializes a new instance of . + /// Initializes a new instance of . /// The type of resource. /// is null. - public FhirR4Resource(string resourceType) + public Resource(string resourceType) { Argument.AssertNotNull(resourceType, nameof(resourceType)); @@ -27,14 +27,14 @@ public FhirR4Resource(string resourceType) AdditionalProperties = new ChangeTrackingDictionary(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The type of resource. /// Resource Id. /// Metadata about the resource. /// A set of rules under which this content was created. /// Language of the resource content. /// Additional Properties. - internal FhirR4Resource(string resourceType, string id, FhirR4Meta meta, string implicitRules, string language, IDictionary additionalProperties) + internal Resource(string resourceType, string id, Meta meta, string implicitRules, string language, IDictionary additionalProperties) { ResourceType = resourceType; Id = id; @@ -44,8 +44,8 @@ internal FhirR4Resource(string resourceType, string id, FhirR4Meta meta, string AdditionalProperties = additionalProperties; } - /// Initializes a new instance of for deserialization. - internal FhirR4Resource() + /// Initializes a new instance of for deserialization. + internal Resource() { } @@ -54,7 +54,7 @@ internal FhirR4Resource() /// Resource Id. public string Id { get; set; } /// Metadata about the resource. - public FhirR4Meta Meta { get; set; } + public Meta Meta { get; set; } /// A set of rules under which this content was created. public string ImplicitRules { get; set; } /// Language of the resource content. diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4SampledData.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SampledData.Serialization.cs similarity index 76% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4SampledData.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SampledData.Serialization.cs index e1d1da214123c..a9a653b0ae5bb 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4SampledData.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SampledData.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - public partial class FhirR4SampledData : IUtf8JsonSerializable, IJsonModel + public partial class SampledData : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4SampledData)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(SampledData)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -85,19 +85,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrite writer.WriteEndObject(); } - FhirR4SampledData IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + SampledData IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4SampledData)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(SampledData)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4SampledData(document.RootElement, options); + return DeserializeSampledData(document.RootElement, options); } - internal static FhirR4SampledData DeserializeFhirR4SampledData(JsonElement element, ModelReaderWriterOptions options = null) + internal static SampledData DeserializeSampledData(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -105,7 +105,7 @@ internal static FhirR4SampledData DeserializeFhirR4SampledData(JsonElement eleme { return null; } - FhirR4Quantity origin = default; + Quantity origin = default; double period = default; double? factor = default; double? lowerLimit = default; @@ -113,14 +113,14 @@ internal static FhirR4SampledData DeserializeFhirR4SampledData(JsonElement eleme int dimensions = default; string data = default; string id = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("origin"u8)) { - origin = FhirR4Quantity.DeserializeFhirR4Quantity(property.Value, options); + origin = Quantity.DeserializeQuantity(property.Value, options); continue; } if (property.NameEquals("period"u8)) @@ -176,10 +176,10 @@ internal static FhirR4SampledData DeserializeFhirR4SampledData(JsonElement eleme { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -190,9 +190,9 @@ internal static FhirR4SampledData DeserializeFhirR4SampledData(JsonElement eleme } } serializedAdditionalRawData = rawDataDictionary; - return new FhirR4SampledData( + return new SampledData( id, - extension ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), serializedAdditionalRawData, origin, period, @@ -203,43 +203,43 @@ internal static FhirR4SampledData DeserializeFhirR4SampledData(JsonElement eleme data); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4SampledData)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(SampledData)} does not support writing '{options.Format}' format."); } } - FhirR4SampledData IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + SampledData IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4SampledData(document.RootElement, options); + return DeserializeSampledData(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4SampledData)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(SampledData)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new FhirR4SampledData FromResponse(Response response) + internal static new SampledData FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeFhirR4SampledData(document.RootElement); + return DeserializeSampledData(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4SampledData.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SampledData.cs similarity index 76% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4SampledData.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SampledData.cs index de34839eee270..b98e51b6362d9 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/FhirR4SampledData.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SampledData.cs @@ -14,14 +14,14 @@ namespace Azure.Health.Insights.RadiologyInsights /// A series of measurements taken by a device /// Based on [FHIR SampledData](https://www.hl7.org/fhir/R4/datatypes.html#SampledData) /// - public partial class FhirR4SampledData : FhirR4Element + public partial class SampledData : Element { - /// Initializes a new instance of . + /// Initializes a new instance of . /// Zero value and units. /// Number of milliseconds between samples. /// Number of sample points at each time point. /// is null. - public FhirR4SampledData(FhirR4Quantity origin, double period, int dimensions) + public SampledData(Quantity origin, double period, int dimensions) { Argument.AssertNotNull(origin, nameof(origin)); @@ -30,7 +30,7 @@ public FhirR4SampledData(FhirR4Quantity origin, double period, int dimensions) Dimensions = dimensions; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Unique id for inter-element referencing. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. @@ -41,7 +41,7 @@ public FhirR4SampledData(FhirR4Quantity origin, double period, int dimensions) /// Upper limit of detection. /// Number of sample points at each time point. /// Decimal values with spaces, or "E" | "U" | "L". - internal FhirR4SampledData(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4Quantity origin, double period, double? factor, double? lowerLimit, double? upperLimit, int dimensions, string data) : base(id, extension, serializedAdditionalRawData) + internal SampledData(string id, IReadOnlyList extension, IDictionary serializedAdditionalRawData, Quantity origin, double period, double? factor, double? lowerLimit, double? upperLimit, int dimensions, string data) : base(id, extension, serializedAdditionalRawData) { Origin = origin; Period = period; @@ -52,13 +52,13 @@ internal FhirR4SampledData(string id, IReadOnlyList extension, Data = data; } - /// Initializes a new instance of for deserialization. - internal FhirR4SampledData() + /// Initializes a new instance of for deserialization. + internal SampledData() { } /// Zero value and units. - public FhirR4Quantity Origin { get; set; } + public Quantity Origin { get; set; } /// Number of milliseconds between samples. public double Period { get; set; } /// Multiply data by this before adding to origin. diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.Serialization.cs index 4b867f4952f73..656b107ccd1da 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.Serialization.cs @@ -78,16 +78,16 @@ internal static SexMismatchInference DeserializeSexMismatchInference(JsonElement { return null; } - FhirR4CodeableConcept sexIndication = default; + CodeableConcept sexIndication = default; string kind = default; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("sexIndication"u8)) { - sexIndication = FhirR4CodeableConcept.DeserializeFhirR4CodeableConcept(property.Value, options); + sexIndication = CodeableConcept.DeserializeCodeableConcept(property.Value, options); continue; } if (property.NameEquals("kind"u8)) @@ -101,10 +101,10 @@ internal static SexMismatchInference DeserializeSexMismatchInference(JsonElement { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -115,7 +115,7 @@ internal static SexMismatchInference DeserializeSexMismatchInference(JsonElement } } serializedAdditionalRawData = rawDataDictionary; - return new SexMismatchInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, sexIndication); + return new SexMismatchInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData, sexIndication); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.cs index 80944c53eaedb..c31d2496b98b3 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/SexMismatchInference.cs @@ -16,7 +16,7 @@ public partial class SexMismatchInference : RadiologyInsightsInference /// Initializes a new instance of . /// Sex indication : SNOMED CT code for gender finding. /// is null. - internal SexMismatchInference(FhirR4CodeableConcept sexIndication) + internal SexMismatchInference(CodeableConcept sexIndication) { Argument.AssertNotNull(sexIndication, nameof(sexIndication)); @@ -29,7 +29,7 @@ internal SexMismatchInference(FhirR4CodeableConcept sexIndication) /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. /// Sex indication : SNOMED CT code for gender finding. - internal SexMismatchInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, FhirR4CodeableConcept sexIndication) : base(kind, extension, serializedAdditionalRawData) + internal SexMismatchInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData, CodeableConcept sexIndication) : base(kind, extension, serializedAdditionalRawData) { SexIndication = sexIndication; } @@ -40,6 +40,6 @@ internal SexMismatchInference() } /// Sex indication : SNOMED CT code for gender finding. - public FhirR4CodeableConcept SexIndication { get; } + public CodeableConcept SexIndication { get; } } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownFhirR4DomainResource.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownDomainResource.Serialization.cs similarity index 71% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownFhirR4DomainResource.Serialization.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownDomainResource.Serialization.cs index 5bfe1eb106c1e..9f855811db7b5 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownFhirR4DomainResource.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownDomainResource.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Health.Insights.RadiologyInsights { - internal partial class UnknownFhirR4DomainResource : IUtf8JsonSerializable, IJsonModel + internal partial class UnknownDomainResource : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -98,19 +98,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WriteEndObject(); } - FhirR4DomainResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + DomainResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeFhirR4DomainResource(document.RootElement, options); + return DeserializeDomainResource(document.RootElement, options); } - internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResource(JsonElement element, ModelReaderWriterOptions options = null) + internal static UnknownDomainResource DeserializeUnknownDomainResource(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -118,13 +118,13 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour { return null; } - FhirR4Narrative text = default; - IList contained = default; - IList extension = default; - IList modifierExtension = default; + Narrative text = default; + IList contained = default; + IList extension = default; + IList modifierExtension = default; string resourceType = "Unknown"; string id = default; - FhirR4Meta meta = default; + Meta meta = default; string implicitRules = default; string language = default; IDictionary additionalProperties = default; @@ -137,7 +137,7 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour { continue; } - text = FhirR4Narrative.DeserializeFhirR4Narrative(property.Value, options); + text = Narrative.DeserializeNarrative(property.Value, options); continue; } if (property.NameEquals("contained"u8)) @@ -146,10 +146,10 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(DeserializeFhirR4Resource(item, options)); + array.Add(DeserializeResource(item, options)); } contained = array; continue; @@ -160,10 +160,10 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -174,10 +174,10 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } modifierExtension = array; continue; @@ -198,7 +198,7 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour { continue; } - meta = FhirR4Meta.DeserializeFhirR4Meta(property.Value, options); + meta = Meta.DeserializeMeta(property.Value, options); continue; } if (property.NameEquals("implicitRules"u8)) @@ -214,7 +214,7 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new UnknownFhirR4DomainResource( + return new UnknownDomainResource( resourceType, id, meta, @@ -222,48 +222,48 @@ internal static UnknownFhirR4DomainResource DeserializeUnknownFhirR4DomainResour language, additionalProperties, text, - contained ?? new ChangeTrackingList(), - extension ?? new ChangeTrackingList(), - modifierExtension ?? new ChangeTrackingList()); + contained ?? new ChangeTrackingList(), + extension ?? new ChangeTrackingList(), + modifierExtension ?? new ChangeTrackingList()); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support writing '{options.Format}' format."); } } - FhirR4DomainResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + DomainResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeFhirR4DomainResource(document.RootElement, options); + return DeserializeDomainResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(FhirR4DomainResource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(DomainResource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new UnknownFhirR4DomainResource FromResponse(Response response) + internal static new UnknownDomainResource FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeUnknownFhirR4DomainResource(document.RootElement); + return DeserializeUnknownDomainResource(document.RootElement); } /// Convert into a . diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownFhirR4DomainResource.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownDomainResource.cs similarity index 62% rename from sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownFhirR4DomainResource.cs rename to sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownDomainResource.cs index 7a3478c6c872c..5ae58c8c69025 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownFhirR4DomainResource.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownDomainResource.cs @@ -10,10 +10,10 @@ namespace Azure.Health.Insights.RadiologyInsights { - /// Unknown version of Fhir_R4_DomainResource. - internal partial class UnknownFhirR4DomainResource : FhirR4DomainResource + /// Unknown version of DomainResource. + internal partial class UnknownDomainResource : DomainResource { - /// Initializes a new instance of . + /// Initializes a new instance of . /// The type of resource. /// Resource Id. /// Metadata about the resource. @@ -24,12 +24,12 @@ internal partial class UnknownFhirR4DomainResource : FhirR4DomainResource /// Contained, inline Resources. /// Additional Content defined by implementations. /// Extensions that cannot be ignored. - internal UnknownFhirR4DomainResource(string resourceType, string id, FhirR4Meta meta, string implicitRules, string language, IDictionary additionalProperties, FhirR4Narrative text, IList contained, IList extension, IList modifierExtension) : base(resourceType, id, meta, implicitRules, language, additionalProperties, text, contained, extension, modifierExtension) + internal UnknownDomainResource(string resourceType, string id, Meta meta, string implicitRules, string language, IDictionary additionalProperties, Narrative text, IList contained, IList extension, IList modifierExtension) : base(resourceType, id, meta, implicitRules, language, additionalProperties, text, contained, extension, modifierExtension) { } - /// Initializes a new instance of for deserialization. - internal UnknownFhirR4DomainResource() + /// Initializes a new instance of for deserialization. + internal UnknownDomainResource() { } } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.Serialization.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.Serialization.cs index e980ef5c3ba65..6757c5618e1b2 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.Serialization.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.Serialization.cs @@ -77,7 +77,7 @@ internal static UnknownRadiologyInsightsInference DeserializeUnknownRadiologyIns return null; } string kind = "Unknown"; - IReadOnlyList extension = default; + IReadOnlyList extension = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -93,10 +93,10 @@ internal static UnknownRadiologyInsightsInference DeserializeUnknownRadiologyIns { continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(FhirR4Extension.DeserializeFhirR4Extension(item, options)); + array.Add(RadiologyInsights.Extension.DeserializeExtension(item, options)); } extension = array; continue; @@ -107,7 +107,7 @@ internal static UnknownRadiologyInsightsInference DeserializeUnknownRadiologyIns } } serializedAdditionalRawData = rawDataDictionary; - return new UnknownRadiologyInsightsInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData); + return new UnknownRadiologyInsightsInference(kind, extension ?? new ChangeTrackingList(), serializedAdditionalRawData); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.cs index 78ccdfa433aa9..802aeb8e02850 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/src/Generated/UnknownRadiologyInsightsInference.cs @@ -17,7 +17,7 @@ internal partial class UnknownRadiologyInsightsInference : RadiologyInsightsInfe /// Discriminator. /// Additional Content defined by implementations. /// Keeps track of any properties unknown to the library. - internal UnknownRadiologyInsightsInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData) : base(kind, extension, serializedAdditionalRawData) + internal UnknownRadiologyInsightsInference(string kind, IReadOnlyList extension, IDictionary serializedAdditionalRawData) : base(kind, extension, serializedAdditionalRawData) { } diff --git a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/tests/Generated/Samples/Samples_RadiologyInsightsClient.cs b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/tests/Generated/Samples/Samples_RadiologyInsightsClient.cs index d1684ed5ec759..223a07a526605 100644 --- a/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/tests/Generated/Samples/Samples_RadiologyInsightsClient.cs +++ b/sdk/healthinsights/Azure.Health.Insights.RadiologyInsights/tests/Generated/Samples/Samples_RadiologyInsightsClient.cs @@ -771,20 +771,20 @@ public void Example_RadiologyInsightsClient_InferRadiologyInsights_AllParameters { new PatientRecord("") { -Info = new PatientDetails +Info = new PatientInfo { Sex = PatientSex.Female, BirthDate = DateTimeOffset.Parse("2022-05-10"), -ClinicalInfo = {new FhirR4Resource("") +ClinicalInfo = {new Resource("") { Id = "", -Meta = new FhirR4Meta +Meta = new Meta { VersionId = "", LastUpdated = "", Source = "", Profile = {""}, -Security = {new FhirR4Coding +Security = {new Coding { System = "", Version = "", @@ -868,20 +868,20 @@ public async Task Example_RadiologyInsightsClient_InferRadiologyInsights_AllPara { new PatientRecord("") { -Info = new PatientDetails +Info = new PatientInfo { Sex = PatientSex.Female, BirthDate = DateTimeOffset.Parse("2022-05-10"), -ClinicalInfo = {new FhirR4Resource("") +ClinicalInfo = {new Resource("") { Id = "", -Meta = new FhirR4Meta +Meta = new Meta { VersionId = "", LastUpdated = "", Source = "", Profile = {""}, -Security = {new FhirR4Coding +Security = {new Coding { System = "", Version = "", diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AnalyticsPurviewDataMapModelFactory.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AnalyticsPurviewDataMapModelFactory.cs index d545a38b54e9b..0b44148afba5c 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AnalyticsPurviewDataMapModelFactory.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AnalyticsPurviewDataMapModelFactory.cs @@ -613,7 +613,7 @@ public static AtlasRelationshipWithExtInfo AtlasRelationshipWithExtInfo(IReadOnl /// The label of the relationship. /// An array of attribute definitions. /// A new instance for mocking. - public static AtlasTypeDef AtlasTypeDef(TypeCategory? category = null, long? createTime = null, string createdBy = null, AtlasDateFormat dateFormatter = null, string description = null, string guid = null, string name = null, IReadOnlyDictionary options = null, string serviceType = null, string typeVersion = null, long? updateTime = null, string updatedBy = null, long? version = null, string lastModifiedTS = null, IEnumerable entityTypes = null, IEnumerable subTypes = null, IEnumerable superTypes = null, IEnumerable relationshipAttributeDefs = null, string defaultValue = null, IEnumerable elementDefs = null, AtlasRelationshipEndDef endDef1 = null, AtlasRelationshipEndDef endDef2 = null, RelationshipCategory? relationshipCategory = null, string relationshipLabel = null, IEnumerable attributeDefs = null) + public static AtlasTypeDef AtlasTypeDef(TypeCategory? category = null, long? createTime = null, string createdBy = null, DateFormat dateFormatter = null, string description = null, string guid = null, string name = null, IReadOnlyDictionary options = null, string serviceType = null, string typeVersion = null, long? updateTime = null, string updatedBy = null, long? version = null, string lastModifiedTS = null, IEnumerable entityTypes = null, IEnumerable subTypes = null, IEnumerable superTypes = null, IEnumerable relationshipAttributeDefs = null, string defaultValue = null, IEnumerable elementDefs = null, AtlasRelationshipEndDef endDef1 = null, AtlasRelationshipEndDef endDef2 = null, RelationshipCategory? relationshipCategory = null, string relationshipLabel = null, IEnumerable attributeDefs = null) { options ??= new Dictionary(); entityTypes ??= new List(); diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.Serialization.cs index 0bad69b2b75b7..58f270795d96d 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.Serialization.cs @@ -153,7 +153,7 @@ internal static AtlasBusinessMetadataDef DeserializeAtlasBusinessMetadataDef(Jso TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -198,7 +198,7 @@ internal static AtlasBusinessMetadataDef DeserializeAtlasBusinessMetadataDef(Jso { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.cs index 3f178b20df675..05e0d33fdec12 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasBusinessMetadataDef.cs @@ -69,7 +69,7 @@ public AtlasBusinessMetadataDef() /// ETag for concurrency control. /// An array of attribute definitions. /// Keeps track of any properties unknown to the library. - internal AtlasBusinessMetadataDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IDictionary serializedAdditionalRawData) + internal AtlasBusinessMetadataDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -96,7 +96,7 @@ internal AtlasBusinessMetadataDef(TypeCategory? category, long? createTime, stri /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.Serialization.cs index 76df7d00edad1..9cfbd84536efe 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.Serialization.cs @@ -183,7 +183,7 @@ internal static AtlasClassificationDef DeserializeAtlasClassificationDef(JsonEle TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -231,7 +231,7 @@ internal static AtlasClassificationDef DeserializeAtlasClassificationDef(JsonEle { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.cs index 6fe5e3fdc67ed..236f4f7468707 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasClassificationDef.cs @@ -98,7 +98,7 @@ public AtlasClassificationDef() /// An array of sub types. /// An array of super types. /// Keeps track of any properties unknown to the library. - internal AtlasClassificationDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IList entityTypes, IList subTypes, IList superTypes, IDictionary serializedAdditionalRawData) + internal AtlasClassificationDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IList entityTypes, IList subTypes, IList superTypes, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -128,7 +128,7 @@ internal AtlasClassificationDef(TypeCategory? category, long? createTime, string /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.Serialization.cs index ba445d40bbcae..e0dc13e8ee438 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.Serialization.cs @@ -183,7 +183,7 @@ internal static AtlasEntityDef DeserializeAtlasEntityDef(JsonElement element, Mo TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -231,7 +231,7 @@ internal static AtlasEntityDef DeserializeAtlasEntityDef(JsonElement element, Mo { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.cs index ee9ba46132259..0228e5741d471 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEntityDef.cs @@ -75,7 +75,7 @@ public AtlasEntityDef() /// An array of super types. /// An array of relationship attributes. /// Keeps track of any properties unknown to the library. - internal AtlasEntityDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IList subTypes, IList superTypes, IList relationshipAttributeDefs, IDictionary serializedAdditionalRawData) + internal AtlasEntityDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IList subTypes, IList superTypes, IList relationshipAttributeDefs, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -105,7 +105,7 @@ internal AtlasEntityDef(TypeCategory? category, long? createTime, string created /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.Serialization.cs index cd768a5088cc2..f6c98d6306baf 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.Serialization.cs @@ -158,7 +158,7 @@ internal static AtlasEnumDef DeserializeAtlasEnumDef(JsonElement element, ModelR TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -204,7 +204,7 @@ internal static AtlasEnumDef DeserializeAtlasEnumDef(JsonElement element, ModelR { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.cs index 704d9c4e9ad1a..96899aef90517 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasEnumDef.cs @@ -70,7 +70,7 @@ public AtlasEnumDef() /// The default value. /// An array of enum element definitions. /// Keeps track of any properties unknown to the library. - internal AtlasEnumDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, string defaultValue, IList elementDefs, IDictionary serializedAdditionalRawData) + internal AtlasEnumDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, string defaultValue, IList elementDefs, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -98,7 +98,7 @@ internal AtlasEnumDef(TypeCategory? category, long? createTime, string createdBy /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.Serialization.cs index f78968dd2719d..b19a784d73082 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.Serialization.cs @@ -173,7 +173,7 @@ internal static AtlasRelationshipDef DeserializeAtlasRelationshipDef(JsonElement TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -222,7 +222,7 @@ internal static AtlasRelationshipDef DeserializeAtlasRelationshipDef(JsonElement { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.cs index 18e8b3a4e3d6b..b9ae1c3d5a000 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasRelationshipDef.cs @@ -131,7 +131,7 @@ public AtlasRelationshipDef() /// /// The label of the relationship. /// Keeps track of any properties unknown to the library. - internal AtlasRelationshipDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, AtlasRelationshipEndDef endDef1, AtlasRelationshipEndDef endDef2, RelationshipCategory? relationshipCategory, string relationshipLabel, IDictionary serializedAdditionalRawData) + internal AtlasRelationshipDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, AtlasRelationshipEndDef endDef1, AtlasRelationshipEndDef endDef2, RelationshipCategory? relationshipCategory, string relationshipLabel, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -162,7 +162,7 @@ internal AtlasRelationshipDef(TypeCategory? category, long? createTime, string c /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.Serialization.cs index 626effe86a42a..91eba19b39c4f 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.Serialization.cs @@ -153,7 +153,7 @@ internal static AtlasStructDef DeserializeAtlasStructDef(JsonElement element, Mo TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -198,7 +198,7 @@ internal static AtlasStructDef DeserializeAtlasStructDef(JsonElement element, Mo { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.cs index b6f470a35665a..faf417f00a5b4 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasStructDef.cs @@ -69,7 +69,7 @@ public AtlasStructDef() /// ETag for concurrency control. /// An array of attribute definitions. /// Keeps track of any properties unknown to the library. - internal AtlasStructDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IDictionary serializedAdditionalRawData) + internal AtlasStructDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -96,7 +96,7 @@ internal AtlasStructDef(TypeCategory? category, long? createTime, string created /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.Serialization.cs index 59496469789f8..4529cba190b76 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.Serialization.cs @@ -228,7 +228,7 @@ internal static AtlasTypeDef DeserializeAtlasTypeDef(JsonElement element, ModelR TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -283,7 +283,7 @@ internal static AtlasTypeDef DeserializeAtlasTypeDef(JsonElement element, ModelR { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.cs index e3e25681152b3..171a212b0042e 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTypeDef.cs @@ -128,7 +128,7 @@ internal AtlasTypeDef() /// The label of the relationship. /// An array of attribute definitions. /// Keeps track of any properties unknown to the library. - internal AtlasTypeDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IReadOnlyDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IReadOnlyList entityTypes, IReadOnlyList subTypes, IReadOnlyList superTypes, IReadOnlyList relationshipAttributeDefs, string defaultValue, IReadOnlyList elementDefs, AtlasRelationshipEndDef endDef1, AtlasRelationshipEndDef endDef2, RelationshipCategory? relationshipCategory, string relationshipLabel, IReadOnlyList attributeDefs, IDictionary serializedAdditionalRawData) + internal AtlasTypeDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IReadOnlyDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IReadOnlyList entityTypes, IReadOnlyList subTypes, IReadOnlyList superTypes, IReadOnlyList relationshipAttributeDefs, string defaultValue, IReadOnlyList elementDefs, AtlasRelationshipEndDef endDef1, AtlasRelationshipEndDef endDef2, RelationshipCategory? relationshipCategory, string relationshipLabel, IReadOnlyList attributeDefs, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -165,7 +165,7 @@ internal AtlasTypeDef(TypeCategory? category, long? createTime, string createdBy /// The user who created the record. public string CreatedBy { get; } /// The date format. - public AtlasDateFormat DateFormatter { get; } + public DateFormat DateFormatter { get; } /// The description of the type definition. public string Description { get; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteConfig.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteOptions.Serialization.cs similarity index 72% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteConfig.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteOptions.Serialization.cs index cbab1107eb0db..bf3e1fc29b20d 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteConfig.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteOptions.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class AutoCompleteConfig : IUtf8JsonSerializable, IJsonModel + public partial class AutoCompleteOptions : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AutoCompleteConfig)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(AutoCompleteOptions)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -66,19 +66,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteEndObject(); } - AutoCompleteConfig IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + AutoCompleteOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AutoCompleteConfig)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(AutoCompleteOptions)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAutoCompleteConfig(document.RootElement, options); + return DeserializeAutoCompleteOptions(document.RootElement, options); } - internal static AutoCompleteConfig DeserializeAutoCompleteConfig(JsonElement element, ModelReaderWriterOptions options = null) + internal static AutoCompleteOptions DeserializeAutoCompleteOptions(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -122,46 +122,46 @@ internal static AutoCompleteConfig DeserializeAutoCompleteConfig(JsonElement ele } } serializedAdditionalRawData = rawDataDictionary; - return new AutoCompleteConfig(keywords, limit, filter, serializedAdditionalRawData); + return new AutoCompleteOptions(keywords, limit, filter, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(AutoCompleteConfig)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(AutoCompleteOptions)} does not support writing '{options.Format}' format."); } } - AutoCompleteConfig IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + AutoCompleteOptions IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeAutoCompleteConfig(document.RootElement, options); + return DeserializeAutoCompleteOptions(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(AutoCompleteConfig)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(AutoCompleteOptions)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AutoCompleteConfig FromResponse(Response response) + internal static AutoCompleteOptions FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeAutoCompleteConfig(document.RootElement); + return DeserializeAutoCompleteOptions(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteConfig.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteOptions.cs similarity index 93% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteConfig.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteOptions.cs index 3a8c72aa0520b..503c8c4d1f2c9 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteConfig.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AutoCompleteOptions.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The payload of autocomplete request. - public partial class AutoCompleteConfig + public partial class AutoCompleteOptions { /// /// Keeps track of any properties unknown to the library. @@ -45,12 +45,12 @@ public partial class AutoCompleteConfig /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public AutoCompleteConfig() + /// Initializes a new instance of . + public AutoCompleteOptions() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// /// The keywords applied to all fields that support autocomplete operation. It must /// be at least 1 character, and no more than 100 characters. @@ -61,7 +61,7 @@ public AutoCompleteConfig() /// /// The filter for the autocomplete request. /// Keeps track of any properties unknown to the library. - internal AutoCompleteConfig(string keywords, int? limit, BinaryData filter, IDictionary serializedAdditionalRawData) + internal AutoCompleteOptions(string keywords, int? limit, BinaryData filter, IDictionary serializedAdditionalRawData) { Keywords = keywords; Limit = limit; diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateConfig.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateOptions.Serialization.cs similarity index 70% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateConfig.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateOptions.Serialization.cs index 247ed8473259d..a27a9ee208c72 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateConfig.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateOptions.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class ClassificationAssociateConfig : IUtf8JsonSerializable, IJsonModel + public partial class ClassificationAssociateOptions : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(ClassificationAssociateConfig)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ClassificationAssociateOptions)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -59,19 +59,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode writer.WriteEndObject(); } - ClassificationAssociateConfig IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + ClassificationAssociateOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(ClassificationAssociateConfig)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ClassificationAssociateOptions)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeClassificationAssociateConfig(document.RootElement, options); + return DeserializeClassificationAssociateOptions(document.RootElement, options); } - internal static ClassificationAssociateConfig DeserializeClassificationAssociateConfig(JsonElement element, ModelReaderWriterOptions options = null) + internal static ClassificationAssociateOptions DeserializeClassificationAssociateOptions(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -114,46 +114,46 @@ internal static ClassificationAssociateConfig DeserializeClassificationAssociate } } serializedAdditionalRawData = rawDataDictionary; - return new ClassificationAssociateConfig(classification, entityGuids ?? new ChangeTrackingList(), serializedAdditionalRawData); + return new ClassificationAssociateOptions(classification, entityGuids ?? new ChangeTrackingList(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(ClassificationAssociateConfig)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ClassificationAssociateOptions)} does not support writing '{options.Format}' format."); } } - ClassificationAssociateConfig IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + ClassificationAssociateOptions IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeClassificationAssociateConfig(document.RootElement, options); + return DeserializeClassificationAssociateOptions(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(ClassificationAssociateConfig)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ClassificationAssociateOptions)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static ClassificationAssociateConfig FromResponse(Response response) + internal static ClassificationAssociateOptions FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeClassificationAssociateConfig(document.RootElement); + return DeserializeClassificationAssociateOptions(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateConfig.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateOptions.cs similarity index 88% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateConfig.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateOptions.cs index b055730daa9d2..838f785f59a03 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateConfig.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/ClassificationAssociateOptions.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The request payload for classification association. - public partial class ClassificationAssociateConfig + public partial class ClassificationAssociateOptions { /// /// Keeps track of any properties unknown to the library. @@ -45,20 +45,20 @@ public partial class ClassificationAssociateConfig /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public ClassificationAssociateConfig() + /// Initializes a new instance of . + public ClassificationAssociateOptions() { EntityGuids = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// /// An instance of a classification; it doesn't have an identity, this object /// exists only when associated with an entity. /// /// The GUID of the entity. /// Keeps track of any properties unknown to the library. - internal ClassificationAssociateConfig(AtlasClassification classification, IList entityGuids, IDictionary serializedAdditionalRawData) + internal ClassificationAssociateOptions(AtlasClassification classification, IList entityGuids, IDictionary serializedAdditionalRawData) { Classification = classification; EntityGuids = entityGuids; diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasDateFormat.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/DateFormat.Serialization.cs similarity index 75% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasDateFormat.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/DateFormat.Serialization.cs index fef6efc0c9ef9..35fd9584bcaf1 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasDateFormat.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/DateFormat.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class AtlasDateFormat : IUtf8JsonSerializable, IJsonModel + public partial class DateFormat : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AtlasDateFormat)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(DateFormat)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -94,19 +94,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO writer.WriteEndObject(); } - AtlasDateFormat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + DateFormat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AtlasDateFormat)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(DateFormat)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAtlasDateFormat(document.RootElement, options); + return DeserializeDateFormat(document.RootElement, options); } - internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, ModelReaderWriterOptions options = null) + internal static DateFormat DeserializeDateFormat(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -116,13 +116,13 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, } IList availableLocales = default; float? calendar = default; - AtlasDateFormat dateInstance = default; - AtlasDateFormat dateTimeInstance = default; - AtlasDateFormat instance = default; + DateFormat dateInstance = default; + DateFormat dateTimeInstance = default; + DateFormat instance = default; bool? lenient = default; - AtlasNumberFormat numberFormat = default; - AtlasDateFormat timeInstance = default; - AtlasTimeZone timeZone = default; + NumberFormat numberFormat = default; + DateFormat timeInstance = default; + TimeZone timeZone = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -156,7 +156,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, { continue; } - dateInstance = DeserializeAtlasDateFormat(property.Value, options); + dateInstance = DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("dateTimeInstance"u8)) @@ -165,7 +165,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, { continue; } - dateTimeInstance = DeserializeAtlasDateFormat(property.Value, options); + dateTimeInstance = DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("instance"u8)) @@ -174,7 +174,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, { continue; } - instance = DeserializeAtlasDateFormat(property.Value, options); + instance = DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("lenient"u8)) @@ -192,7 +192,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, { continue; } - numberFormat = AtlasNumberFormat.DeserializeAtlasNumberFormat(property.Value, options); + numberFormat = NumberFormat.DeserializeNumberFormat(property.Value, options); continue; } if (property.NameEquals("timeInstance"u8)) @@ -201,7 +201,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, { continue; } - timeInstance = DeserializeAtlasDateFormat(property.Value, options); + timeInstance = DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("timeZone"u8)) @@ -210,7 +210,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, { continue; } - timeZone = AtlasTimeZone.DeserializeAtlasTimeZone(property.Value, options); + timeZone = TimeZone.DeserializeTimeZone(property.Value, options); continue; } if (options.Format != "W") @@ -219,7 +219,7 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, } } serializedAdditionalRawData = rawDataDictionary; - return new AtlasDateFormat( + return new DateFormat( availableLocales ?? new ChangeTrackingList(), calendar, dateInstance, @@ -232,43 +232,43 @@ internal static AtlasDateFormat DeserializeAtlasDateFormat(JsonElement element, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(AtlasDateFormat)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(DateFormat)} does not support writing '{options.Format}' format."); } } - AtlasDateFormat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + DateFormat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeAtlasDateFormat(document.RootElement, options); + return DeserializeDateFormat(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(AtlasDateFormat)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(DateFormat)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AtlasDateFormat FromResponse(Response response) + internal static DateFormat FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeAtlasDateFormat(document.RootElement); + return DeserializeDateFormat(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasDateFormat.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/DateFormat.cs similarity index 79% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasDateFormat.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/DateFormat.cs index 46a56f7d45fd3..12556ebd72199 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasDateFormat.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/DateFormat.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The date format. - public partial class AtlasDateFormat + public partial class DateFormat { /// /// Keeps track of any properties unknown to the library. @@ -45,13 +45,13 @@ public partial class AtlasDateFormat /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public AtlasDateFormat() + /// Initializes a new instance of . + public DateFormat() { AvailableLocales = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// An array of available locales. /// Calendar. /// The date format. @@ -62,7 +62,7 @@ public AtlasDateFormat() /// The date format. /// The timezone information. /// Keeps track of any properties unknown to the library. - internal AtlasDateFormat(IList availableLocales, float? calendar, AtlasDateFormat dateInstance, AtlasDateFormat dateTimeInstance, AtlasDateFormat instance, bool? lenient, AtlasNumberFormat numberFormat, AtlasDateFormat timeInstance, AtlasTimeZone timeZone, IDictionary serializedAdditionalRawData) + internal DateFormat(IList availableLocales, float? calendar, DateFormat dateInstance, DateFormat dateTimeInstance, DateFormat instance, bool? lenient, NumberFormat numberFormat, DateFormat timeInstance, TimeZone timeZone, IDictionary serializedAdditionalRawData) { AvailableLocales = availableLocales; Calendar = calendar; @@ -81,18 +81,18 @@ internal AtlasDateFormat(IList availableLocales, float? calendar, AtlasD /// Calendar. public float? Calendar { get; set; } /// The date format. - public AtlasDateFormat DateInstance { get; set; } + public DateFormat DateInstance { get; set; } /// The date format. - public AtlasDateFormat DateTimeInstance { get; set; } + public DateFormat DateTimeInstance { get; set; } /// The date format. - public AtlasDateFormat Instance { get; set; } + public DateFormat Instance { get; set; } /// Determines the leniency of the date format. public bool? Lenient { get; set; } /// The number format. - public AtlasNumberFormat NumberFormat { get; set; } + public NumberFormat NumberFormat { get; set; } /// The date format. - public AtlasDateFormat TimeInstance { get; set; } + public DateFormat TimeInstance { get; set; } /// The timezone information. - public AtlasTimeZone TimeZone { get; set; } + public TimeZone TimeZone { get; set; } } } diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Discovery.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Discovery.cs index 9bda0cb30e054..6b1c79f84d92c 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Discovery.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Discovery.cs @@ -50,30 +50,30 @@ internal Discovery(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, T } /// Get data using search. - /// The search query of advanced search request. + /// The search query of advanced search request. /// The cancellation token to use. - /// is null. - /// - public virtual async Task> QueryAsync(QueryConfig queryConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual async Task> QueryAsync(QueryOptions queryOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(queryConfig, nameof(queryConfig)); + Argument.AssertNotNull(queryOptions, nameof(queryOptions)); - using RequestContent content = queryConfig.ToRequestContent(); + using RequestContent content = queryOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = await QueryAsync(content, context).ConfigureAwait(false); return Response.FromValue(QueryResult.FromResponse(response), response); } /// Get data using search. - /// The search query of advanced search request. + /// The search query of advanced search request. /// The cancellation token to use. - /// is null. - /// - public virtual Response Query(QueryConfig queryConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual Response Query(QueryOptions queryOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(queryConfig, nameof(queryConfig)); + Argument.AssertNotNull(queryOptions, nameof(queryOptions)); - using RequestContent content = queryConfig.ToRequestContent(); + using RequestContent content = queryOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = Query(content, context); return Response.FromValue(QueryResult.FromResponse(response), response); @@ -89,7 +89,7 @@ public virtual Response Query(QueryConfig queryConfig, Cancellation /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -128,7 +128,7 @@ public virtual async Task QueryAsync(RequestContent content, RequestCo /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -158,30 +158,30 @@ public virtual Response Query(RequestContent content, RequestContext context = n } /// Get search suggestions by query criteria. - /// The payload of suggest request. + /// The payload of suggest request. /// The cancellation token to use. - /// is null. - /// - public virtual async Task> SuggestAsync(SuggestConfig suggestConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual async Task> SuggestAsync(SuggestOptions suggestOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(suggestConfig, nameof(suggestConfig)); + Argument.AssertNotNull(suggestOptions, nameof(suggestOptions)); - using RequestContent content = suggestConfig.ToRequestContent(); + using RequestContent content = suggestOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = await SuggestAsync(content, context).ConfigureAwait(false); return Response.FromValue(SuggestResult.FromResponse(response), response); } /// Get search suggestions by query criteria. - /// The payload of suggest request. + /// The payload of suggest request. /// The cancellation token to use. - /// is null. - /// - public virtual Response Suggest(SuggestConfig suggestConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual Response Suggest(SuggestOptions suggestOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(suggestConfig, nameof(suggestConfig)); + Argument.AssertNotNull(suggestOptions, nameof(suggestOptions)); - using RequestContent content = suggestConfig.ToRequestContent(); + using RequestContent content = suggestOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = Suggest(content, context); return Response.FromValue(SuggestResult.FromResponse(response), response); @@ -197,7 +197,7 @@ public virtual Response Suggest(SuggestConfig suggestConfig, Canc /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -236,7 +236,7 @@ public virtual async Task SuggestAsync(RequestContent content, Request /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -266,30 +266,30 @@ public virtual Response Suggest(RequestContent content, RequestContext context = } /// Get auto complete options. - /// The payload of autocomplete request. + /// The payload of autocomplete request. /// The cancellation token to use. - /// is null. - /// - public virtual async Task> AutoCompleteAsync(AutoCompleteConfig autoCompleteConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual async Task> AutoCompleteAsync(AutoCompleteOptions autoCompleteOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(autoCompleteConfig, nameof(autoCompleteConfig)); + Argument.AssertNotNull(autoCompleteOptions, nameof(autoCompleteOptions)); - using RequestContent content = autoCompleteConfig.ToRequestContent(); + using RequestContent content = autoCompleteOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = await AutoCompleteAsync(content, context).ConfigureAwait(false); return Response.FromValue(AutoCompleteResult.FromResponse(response), response); } /// Get auto complete options. - /// The payload of autocomplete request. + /// The payload of autocomplete request. /// The cancellation token to use. - /// is null. - /// - public virtual Response AutoComplete(AutoCompleteConfig autoCompleteConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual Response AutoComplete(AutoCompleteOptions autoCompleteOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(autoCompleteConfig, nameof(autoCompleteConfig)); + Argument.AssertNotNull(autoCompleteOptions, nameof(autoCompleteOptions)); - using RequestContent content = autoCompleteConfig.ToRequestContent(); + using RequestContent content = autoCompleteOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = AutoComplete(content, context); return Response.FromValue(AutoCompleteResult.FromResponse(response), response); @@ -305,7 +305,7 @@ public virtual Response AutoComplete(AutoCompleteConfig auto /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -344,7 +344,7 @@ public virtual async Task AutoCompleteAsync(RequestContent content, Re /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Discovery.xml b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Discovery.xml index 1095890f2913b..3cb6378343fa1 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Discovery.xml +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Discovery.xml @@ -1,7 +1,7 @@ - + This sample shows how to call QueryAsync. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -QueryConfig queryConfig = new QueryConfig(); -Response response = await client.QueryAsync(queryConfig); +QueryOptions queryOptions = new QueryOptions(); +Response response = await client.QueryAsync(queryOptions); ]]> This sample shows how to call QueryAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -QueryConfig queryConfig = new QueryConfig +QueryOptions queryOptions = new QueryOptions { Keywords = "", Limit = 1234, @@ -41,10 +41,10 @@ QueryConfig queryConfig = new QueryConfig Facet = default, }, }; -Response response = await client.QueryAsync(queryConfig); +Response response = await client.QueryAsync(queryOptions); ]]> - + This sample shows how to call Query. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -QueryConfig queryConfig = new QueryConfig(); -Response response = client.Query(queryConfig); +QueryOptions queryOptions = new QueryOptions(); +Response response = client.Query(queryOptions); ]]> This sample shows how to call Query with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -QueryConfig queryConfig = new QueryConfig +QueryOptions queryOptions = new QueryOptions { Keywords = "", Limit = 1234, @@ -84,7 +84,7 @@ QueryConfig queryConfig = new QueryConfig Facet = default, }, }; -Response response = client.Query(queryConfig); +Response response = client.Query(queryOptions); ]]> @@ -305,7 +305,7 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("termTemplate")[0]. Console.WriteLine(result.GetProperty("value")[0].GetProperty("longDescription").ToString()); ]]> - + This sample shows how to call SuggestAsync. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -SuggestConfig suggestConfig = new SuggestConfig(); -Response response = await client.SuggestAsync(suggestConfig); +SuggestOptions suggestOptions = new SuggestOptions(); +Response response = await client.SuggestAsync(suggestOptions); ]]> This sample shows how to call SuggestAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -SuggestConfig suggestConfig = new SuggestConfig +SuggestOptions suggestOptions = new SuggestOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; -Response response = await client.SuggestAsync(suggestConfig); +Response response = await client.SuggestAsync(suggestOptions); ]]> - + This sample shows how to call Suggest. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -SuggestConfig suggestConfig = new SuggestConfig(); -Response response = client.Suggest(suggestConfig); +SuggestOptions suggestOptions = new SuggestOptions(); +Response response = client.Suggest(suggestOptions); ]]> This sample shows how to call Suggest with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -SuggestConfig suggestConfig = new SuggestConfig +SuggestOptions suggestOptions = new SuggestOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; -Response response = client.Suggest(suggestConfig); +Response response = client.Suggest(suggestOptions); ]]> @@ -471,7 +471,7 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("termTemplate")[0]. Console.WriteLine(result.GetProperty("value")[0].GetProperty("longDescription").ToString()); ]]> - + This sample shows how to call AutoCompleteAsync. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig(); -Response response = await client.AutoCompleteAsync(autoCompleteConfig); +AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions(); +Response response = await client.AutoCompleteAsync(autoCompleteOptions); ]]> This sample shows how to call AutoCompleteAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig +AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; -Response response = await client.AutoCompleteAsync(autoCompleteConfig); +Response response = await client.AutoCompleteAsync(autoCompleteOptions); ]]> - + This sample shows how to call AutoComplete. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig(); -Response response = client.AutoComplete(autoCompleteConfig); +AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions(); +Response response = client.AutoComplete(autoCompleteOptions); ]]> This sample shows how to call AutoComplete with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); -AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig +AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; -Response response = client.AutoComplete(autoCompleteConfig); +Response response = client.AutoComplete(autoCompleteOptions); ]]> diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Entity.xml b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Entity.xml index 132c4111fa473..406df55815a89 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Entity.xml +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/Entity.xml @@ -1539,7 +1539,7 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString()); ]]> - + This sample shows how to call AddClassificationAsync. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); -ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig(); -Response response = await client.AddClassificationAsync(classificationAssociateConfig); +ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions(); +Response response = await client.AddClassificationAsync(classificationAssociateOptions); ]]> This sample shows how to call AddClassificationAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); -ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig +ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions { Classification = new AtlasClassification { @@ -1578,10 +1578,10 @@ ClassificationAssociateConfig classificationAssociateConfig = new Classification }, EntityGuids = { "" }, }; -Response response = await client.AddClassificationAsync(classificationAssociateConfig); +Response response = await client.AddClassificationAsync(classificationAssociateOptions); ]]> - + This sample shows how to call AddClassification. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); -ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig(); -Response response = client.AddClassification(classificationAssociateConfig); +ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions(); +Response response = client.AddClassification(classificationAssociateOptions); ]]> This sample shows how to call AddClassification with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); -ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig +ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions { Classification = new AtlasClassification { @@ -1620,7 +1620,7 @@ ClassificationAssociateConfig classificationAssociateConfig = new Classification }, EntityGuids = { "" }, }; -Response response = client.AddClassification(classificationAssociateConfig); +Response response = client.AddClassification(classificationAssociateOptions); ]]> @@ -6387,7 +6387,7 @@ Response response = client.AddLabelsByUniqueAttribute("", content, att Console.WriteLine(response.Status); ]]> - + This sample shows how to call MoveEntitiesToCollectionAsync. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); -MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig(); -Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesConfig); +MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions(); +Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesOptions); ]]> This sample shows how to call MoveEntitiesToCollectionAsync with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); -MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig +MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions { EntityGuids = { "" }, }; -Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesConfig); +Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesOptions); ]]> - + This sample shows how to call MoveEntitiesToCollection. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); -MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig(); -Response response = client.MoveEntitiesToCollection("", moveEntitiesConfig); +MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions(); +Response response = client.MoveEntitiesToCollection("", moveEntitiesOptions); ]]> This sample shows how to call MoveEntitiesToCollection with all parameters. "); TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); -MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig +MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions { EntityGuids = { "" }, }; -Response response = client.MoveEntitiesToCollection("", moveEntitiesConfig); +Response response = client.MoveEntitiesToCollection("", moveEntitiesOptions); ]]> diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/TypeDefinition.xml b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/TypeDefinition.xml index fb412241d3107..0590a94bcbe29 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/TypeDefinition.xml +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Docs/TypeDefinition.xml @@ -3507,7 +3507,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", - DateFormatter = new AtlasDateFormat + DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -3515,7 +3515,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef DateTimeInstance = default, Instance = default, Lenient = true, - NumberFormat = new AtlasNumberFormat + NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -3533,7 +3533,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef RoundingMode = RoundingMode.Up, }, TimeInstance = default, - TimeZone = new AtlasTimeZone + TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -3781,7 +3781,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", - DateFormatter = new AtlasDateFormat + DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -3789,7 +3789,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef DateTimeInstance = default, Instance = default, Lenient = true, - NumberFormat = new AtlasNumberFormat + NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -3807,7 +3807,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef RoundingMode = RoundingMode.Up, }, TimeInstance = default, - TimeZone = new AtlasTimeZone + TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -5397,7 +5397,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", - DateFormatter = new AtlasDateFormat + DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -5405,7 +5405,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef DateTimeInstance = default, Instance = default, Lenient = true, - NumberFormat = new AtlasNumberFormat + NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -5423,7 +5423,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef RoundingMode = RoundingMode.Up, }, TimeInstance = default, - TimeZone = new AtlasTimeZone + TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -5671,7 +5671,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", - DateFormatter = new AtlasDateFormat + DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -5679,7 +5679,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef DateTimeInstance = default, Instance = default, Lenient = true, - NumberFormat = new AtlasNumberFormat + NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -5697,7 +5697,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef RoundingMode = RoundingMode.Up, }, TimeInstance = default, - TimeZone = new AtlasTimeZone + TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -7287,7 +7287,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", - DateFormatter = new AtlasDateFormat + DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -7295,7 +7295,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef DateTimeInstance = default, Instance = default, Lenient = true, - NumberFormat = new AtlasNumberFormat + NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -7313,7 +7313,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef RoundingMode = RoundingMode.Up, }, TimeInstance = default, - TimeZone = new AtlasTimeZone + TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -7561,7 +7561,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", - DateFormatter = new AtlasDateFormat + DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -7569,7 +7569,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef DateTimeInstance = default, Instance = default, Lenient = true, - NumberFormat = new AtlasNumberFormat + NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -7587,7 +7587,7 @@ AtlasTypesDef atlasTypesDef = new AtlasTypesDef RoundingMode = RoundingMode.Up, }, TimeInstance = default, - TimeZone = new AtlasTimeZone + TimeZone = new TimeZone { DstSavings = 1234, Id = "", diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Entity.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Entity.cs index fa00f3aa16754..d9ede5be664ba 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Entity.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/Entity.cs @@ -632,30 +632,30 @@ public virtual Response BatchDelete(IEnumerable guid, RequestContext con } /// Associate a classification to multiple entities in bulk. - /// The request payload for classification association. + /// The request payload for classification association. /// The cancellation token to use. - /// is null. - /// - public virtual async Task AddClassificationAsync(ClassificationAssociateConfig classificationAssociateConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual async Task AddClassificationAsync(ClassificationAssociateOptions classificationAssociateOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(classificationAssociateConfig, nameof(classificationAssociateConfig)); + Argument.AssertNotNull(classificationAssociateOptions, nameof(classificationAssociateOptions)); - using RequestContent content = classificationAssociateConfig.ToRequestContent(); + using RequestContent content = classificationAssociateOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = await AddClassificationAsync(content, context).ConfigureAwait(false); return response; } /// Associate a classification to multiple entities in bulk. - /// The request payload for classification association. + /// The request payload for classification association. /// The cancellation token to use. - /// is null. - /// - public virtual Response AddClassification(ClassificationAssociateConfig classificationAssociateConfig, CancellationToken cancellationToken = default) + /// is null. + /// + public virtual Response AddClassification(ClassificationAssociateOptions classificationAssociateOptions, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(classificationAssociateConfig, nameof(classificationAssociateConfig)); + Argument.AssertNotNull(classificationAssociateOptions, nameof(classificationAssociateOptions)); - using RequestContent content = classificationAssociateConfig.ToRequestContent(); + using RequestContent content = classificationAssociateOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = AddClassification(content, context); return response; @@ -671,7 +671,7 @@ public virtual Response AddClassification(ClassificationAssociateConfig classifi /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -710,7 +710,7 @@ public virtual async Task AddClassificationAsync(RequestContent conten /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -4659,16 +4659,16 @@ public virtual Response AddLabelsByUniqueAttribute(string typeName, RequestConte /// Move existing entities to the target collection. /// The collection where entities will be moved to. - /// MoveEntitiesOptions. + /// MoveEntitiesOptions. /// The cancellation token to use. - /// or is null. - /// - public virtual async Task> MoveEntitiesToCollectionAsync(string collectionId, MoveEntitiesConfig moveEntitiesConfig, CancellationToken cancellationToken = default) + /// or is null. + /// + public virtual async Task> MoveEntitiesToCollectionAsync(string collectionId, MoveEntitiesOptions moveEntitiesOptions, CancellationToken cancellationToken = default) { Argument.AssertNotNull(collectionId, nameof(collectionId)); - Argument.AssertNotNull(moveEntitiesConfig, nameof(moveEntitiesConfig)); + Argument.AssertNotNull(moveEntitiesOptions, nameof(moveEntitiesOptions)); - using RequestContent content = moveEntitiesConfig.ToRequestContent(); + using RequestContent content = moveEntitiesOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = await MoveEntitiesToCollectionAsync(collectionId, content, context).ConfigureAwait(false); return Response.FromValue(EntityMutationResult.FromResponse(response), response); @@ -4676,16 +4676,16 @@ public virtual async Task> MoveEntitiesToCollecti /// Move existing entities to the target collection. /// The collection where entities will be moved to. - /// MoveEntitiesOptions. + /// MoveEntitiesOptions. /// The cancellation token to use. - /// or is null. - /// - public virtual Response MoveEntitiesToCollection(string collectionId, MoveEntitiesConfig moveEntitiesConfig, CancellationToken cancellationToken = default) + /// or is null. + /// + public virtual Response MoveEntitiesToCollection(string collectionId, MoveEntitiesOptions moveEntitiesOptions, CancellationToken cancellationToken = default) { Argument.AssertNotNull(collectionId, nameof(collectionId)); - Argument.AssertNotNull(moveEntitiesConfig, nameof(moveEntitiesConfig)); + Argument.AssertNotNull(moveEntitiesOptions, nameof(moveEntitiesOptions)); - using RequestContent content = moveEntitiesConfig.ToRequestContent(); + using RequestContent content = moveEntitiesOptions.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Response response = MoveEntitiesToCollection(collectionId, content, context); return Response.FromValue(EntityMutationResult.FromResponse(response), response); @@ -4701,7 +4701,7 @@ public virtual Response MoveEntitiesToCollection(string co /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -4742,7 +4742,7 @@ public virtual async Task MoveEntitiesToCollectionAsync(string collect /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesConfig.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesOptions.Serialization.cs similarity index 69% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesConfig.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesOptions.Serialization.cs index cf9e515286522..7b7d940791151 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesConfig.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesOptions.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class MoveEntitiesConfig : IUtf8JsonSerializable, IJsonModel + public partial class MoveEntitiesOptions : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(MoveEntitiesConfig)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(MoveEntitiesOptions)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -54,19 +54,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteEndObject(); } - MoveEntitiesConfig IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + MoveEntitiesOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(MoveEntitiesConfig)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(MoveEntitiesOptions)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeMoveEntitiesConfig(document.RootElement, options); + return DeserializeMoveEntitiesOptions(document.RootElement, options); } - internal static MoveEntitiesConfig DeserializeMoveEntitiesConfig(JsonElement element, ModelReaderWriterOptions options = null) + internal static MoveEntitiesOptions DeserializeMoveEntitiesOptions(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -99,46 +99,46 @@ internal static MoveEntitiesConfig DeserializeMoveEntitiesConfig(JsonElement ele } } serializedAdditionalRawData = rawDataDictionary; - return new MoveEntitiesConfig(entityGuids ?? new ChangeTrackingList(), serializedAdditionalRawData); + return new MoveEntitiesOptions(entityGuids ?? new ChangeTrackingList(), serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(MoveEntitiesConfig)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(MoveEntitiesOptions)} does not support writing '{options.Format}' format."); } } - MoveEntitiesConfig IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + MoveEntitiesOptions IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeMoveEntitiesConfig(document.RootElement, options); + return DeserializeMoveEntitiesOptions(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(MoveEntitiesConfig)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(MoveEntitiesOptions)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static MoveEntitiesConfig FromResponse(Response response) + internal static MoveEntitiesOptions FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeMoveEntitiesConfig(document.RootElement); + return DeserializeMoveEntitiesOptions(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesConfig.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesOptions.cs similarity index 89% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesConfig.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesOptions.cs index 112ad5709b699..95e15a65cdc62 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesConfig.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/MoveEntitiesOptions.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// MoveEntitiesOptions. - public partial class MoveEntitiesConfig + public partial class MoveEntitiesOptions { /// /// Keeps track of any properties unknown to the library. @@ -45,16 +45,16 @@ public partial class MoveEntitiesConfig /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public MoveEntitiesConfig() + /// Initializes a new instance of . + public MoveEntitiesOptions() { EntityGuids = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// An array of entity guids to be moved to target collection. /// Keeps track of any properties unknown to the library. - internal MoveEntitiesConfig(IList entityGuids, IDictionary serializedAdditionalRawData) + internal MoveEntitiesOptions(IList entityGuids, IDictionary serializedAdditionalRawData) { EntityGuids = entityGuids; _serializedAdditionalRawData = serializedAdditionalRawData; diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasNumberFormat.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/NumberFormat.Serialization.cs similarity index 81% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasNumberFormat.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/NumberFormat.Serialization.cs index ab44026531c9d..2961c31aedca8 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasNumberFormat.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/NumberFormat.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class AtlasNumberFormat : IUtf8JsonSerializable, IJsonModel + public partial class NumberFormat : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AtlasNumberFormat)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(NumberFormat)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -119,19 +119,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrite writer.WriteEndObject(); } - AtlasNumberFormat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + NumberFormat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AtlasNumberFormat)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(NumberFormat)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAtlasNumberFormat(document.RootElement, options); + return DeserializeNumberFormat(document.RootElement, options); } - internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement element, ModelReaderWriterOptions options = null) + internal static NumberFormat DeserializeNumberFormat(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -141,17 +141,17 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme } IList availableLocales = default; string currency = default; - AtlasNumberFormat currencyInstance = default; + NumberFormat currencyInstance = default; bool? groupingUsed = default; - AtlasNumberFormat instance = default; - AtlasNumberFormat integerInstance = default; + NumberFormat instance = default; + NumberFormat integerInstance = default; int? maximumFractionDigits = default; int? maximumIntegerDigits = default; int? minimumFractionDigits = default; int? minimumIntegerDigits = default; - AtlasNumberFormat numberInstance = default; + NumberFormat numberInstance = default; bool? parseIntegerOnly = default; - AtlasNumberFormat percentInstance = default; + NumberFormat percentInstance = default; RoundingMode? roundingMode = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); @@ -182,7 +182,7 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme { continue; } - currencyInstance = DeserializeAtlasNumberFormat(property.Value, options); + currencyInstance = DeserializeNumberFormat(property.Value, options); continue; } if (property.NameEquals("groupingUsed"u8)) @@ -200,7 +200,7 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme { continue; } - instance = DeserializeAtlasNumberFormat(property.Value, options); + instance = DeserializeNumberFormat(property.Value, options); continue; } if (property.NameEquals("integerInstance"u8)) @@ -209,7 +209,7 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme { continue; } - integerInstance = DeserializeAtlasNumberFormat(property.Value, options); + integerInstance = DeserializeNumberFormat(property.Value, options); continue; } if (property.NameEquals("maximumFractionDigits"u8)) @@ -254,7 +254,7 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme { continue; } - numberInstance = DeserializeAtlasNumberFormat(property.Value, options); + numberInstance = DeserializeNumberFormat(property.Value, options); continue; } if (property.NameEquals("parseIntegerOnly"u8)) @@ -272,7 +272,7 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme { continue; } - percentInstance = DeserializeAtlasNumberFormat(property.Value, options); + percentInstance = DeserializeNumberFormat(property.Value, options); continue; } if (property.NameEquals("roundingMode"u8)) @@ -290,7 +290,7 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme } } serializedAdditionalRawData = rawDataDictionary; - return new AtlasNumberFormat( + return new NumberFormat( availableLocales ?? new ChangeTrackingList(), currency, currencyInstance, @@ -308,43 +308,43 @@ internal static AtlasNumberFormat DeserializeAtlasNumberFormat(JsonElement eleme serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(AtlasNumberFormat)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(NumberFormat)} does not support writing '{options.Format}' format."); } } - AtlasNumberFormat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + NumberFormat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeAtlasNumberFormat(document.RootElement, options); + return DeserializeNumberFormat(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(AtlasNumberFormat)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(NumberFormat)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AtlasNumberFormat FromResponse(Response response) + internal static NumberFormat FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeAtlasNumberFormat(document.RootElement); + return DeserializeNumberFormat(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasNumberFormat.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/NumberFormat.cs similarity index 82% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasNumberFormat.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/NumberFormat.cs index bc283013bf896..f34e3867da88d 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasNumberFormat.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/NumberFormat.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The number format. - public partial class AtlasNumberFormat + public partial class NumberFormat { /// /// Keeps track of any properties unknown to the library. @@ -45,13 +45,13 @@ public partial class AtlasNumberFormat /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public AtlasNumberFormat() + /// Initializes a new instance of . + public NumberFormat() { AvailableLocales = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The number format. /// The currency. /// The number format. @@ -67,7 +67,7 @@ public AtlasNumberFormat() /// The number format. /// The enum of rounding mode. /// Keeps track of any properties unknown to the library. - internal AtlasNumberFormat(IList availableLocales, string currency, AtlasNumberFormat currencyInstance, bool? groupingUsed, AtlasNumberFormat instance, AtlasNumberFormat integerInstance, int? maximumFractionDigits, int? maximumIntegerDigits, int? minimumFractionDigits, int? minimumIntegerDigits, AtlasNumberFormat numberInstance, bool? parseIntegerOnly, AtlasNumberFormat percentInstance, RoundingMode? roundingMode, IDictionary serializedAdditionalRawData) + internal NumberFormat(IList availableLocales, string currency, NumberFormat currencyInstance, bool? groupingUsed, NumberFormat instance, NumberFormat integerInstance, int? maximumFractionDigits, int? maximumIntegerDigits, int? minimumFractionDigits, int? minimumIntegerDigits, NumberFormat numberInstance, bool? parseIntegerOnly, NumberFormat percentInstance, RoundingMode? roundingMode, IDictionary serializedAdditionalRawData) { AvailableLocales = availableLocales; Currency = currency; @@ -91,13 +91,13 @@ internal AtlasNumberFormat(IList availableLocales, string currency, Atla /// The currency. public string Currency { get; set; } /// The number format. - public AtlasNumberFormat CurrencyInstance { get; set; } + public NumberFormat CurrencyInstance { get; set; } /// Determines if grouping is used. public bool? GroupingUsed { get; set; } /// The number format. - public AtlasNumberFormat Instance { get; set; } + public NumberFormat Instance { get; set; } /// The number format. - public AtlasNumberFormat IntegerInstance { get; set; } + public NumberFormat IntegerInstance { get; set; } /// The maximum of fraction digits. public int? MaximumFractionDigits { get; set; } /// The maximum of integer digits. @@ -107,11 +107,11 @@ internal AtlasNumberFormat(IList availableLocales, string currency, Atla /// The minimum of integer digits. public int? MinimumIntegerDigits { get; set; } /// The number format. - public AtlasNumberFormat NumberInstance { get; set; } + public NumberFormat NumberInstance { get; set; } /// Determines if only integer is parsed. public bool? ParseIntegerOnly { get; set; } /// The number format. - public AtlasNumberFormat PercentInstance { get; set; } + public NumberFormat PercentInstance { get; set; } /// The enum of rounding mode. public RoundingMode? RoundingMode { get; set; } } diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryConfig.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryOptions.Serialization.cs similarity index 84% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryConfig.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryOptions.Serialization.cs index fa8b0823342e0..195e5bb32ea0f 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryConfig.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryOptions.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class QueryConfig : IUtf8JsonSerializable, IJsonModel + public partial class QueryOptions : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(QueryConfig)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(QueryOptions)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -108,19 +108,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptio writer.WriteEndObject(); } - QueryConfig IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + QueryOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(QueryConfig)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(QueryOptions)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeQueryConfig(document.RootElement, options); + return DeserializeQueryOptions(document.RootElement, options); } - internal static QueryConfig DeserializeQueryConfig(JsonElement element, ModelReaderWriterOptions options = null) + internal static QueryOptions DeserializeQueryOptions(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -217,7 +217,7 @@ internal static QueryConfig DeserializeQueryConfig(JsonElement element, ModelRea } } serializedAdditionalRawData = rawDataDictionary; - return new QueryConfig( + return new QueryOptions( keywords, limit, continuationToken, @@ -228,43 +228,43 @@ internal static QueryConfig DeserializeQueryConfig(JsonElement element, ModelRea serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(QueryConfig)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(QueryOptions)} does not support writing '{options.Format}' format."); } } - QueryConfig IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + QueryOptions IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeQueryConfig(document.RootElement, options); + return DeserializeQueryOptions(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(QueryConfig)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(QueryOptions)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static QueryConfig FromResponse(Response response) + internal static QueryOptions FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeQueryConfig(document.RootElement); + return DeserializeQueryOptions(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryConfig.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryOptions.cs similarity index 94% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryConfig.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryOptions.cs index ef106784dbe38..5fdc266e06cc7 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryConfig.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/QueryOptions.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The search query of advanced search request. - public partial class QueryConfig + public partial class QueryOptions { /// /// Keeps track of any properties unknown to the library. @@ -45,14 +45,14 @@ public partial class QueryConfig /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public QueryConfig() + /// Initializes a new instance of . + public QueryOptions() { Orderby = new ChangeTrackingList(); Facets = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The keywords applied to all searchable fields. /// /// The limit of the number of the search result. default value is 50; maximum @@ -67,7 +67,7 @@ public QueryConfig() /// The facets for search. See examples for the usage of supported facets. /// The taxonomy setting for search. /// Keeps track of any properties unknown to the library. - internal QueryConfig(string keywords, int? limit, string continuationToken, IList orderby, BinaryData filter, IList facets, SearchTaxonomySetting taxonomySetting, IDictionary serializedAdditionalRawData) + internal QueryOptions(string keywords, int? limit, string continuationToken, IList orderby, BinaryData filter, IList facets, SearchTaxonomySetting taxonomySetting, IDictionary serializedAdditionalRawData) { Keywords = keywords; Limit = limit; diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestConfig.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestOptions.Serialization.cs similarity index 74% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestConfig.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestOptions.Serialization.cs index a0bcff9095876..64fe29125d646 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestConfig.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestOptions.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class SuggestConfig : IUtf8JsonSerializable, IJsonModel + public partial class SuggestOptions : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(SuggestConfig)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(SuggestOptions)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -66,19 +66,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpt writer.WriteEndObject(); } - SuggestConfig IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + SuggestOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(SuggestConfig)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(SuggestOptions)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeSuggestConfig(document.RootElement, options); + return DeserializeSuggestOptions(document.RootElement, options); } - internal static SuggestConfig DeserializeSuggestConfig(JsonElement element, ModelReaderWriterOptions options = null) + internal static SuggestOptions DeserializeSuggestOptions(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -122,46 +122,46 @@ internal static SuggestConfig DeserializeSuggestConfig(JsonElement element, Mode } } serializedAdditionalRawData = rawDataDictionary; - return new SuggestConfig(keywords, limit, filter, serializedAdditionalRawData); + return new SuggestOptions(keywords, limit, filter, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(SuggestConfig)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(SuggestOptions)} does not support writing '{options.Format}' format."); } } - SuggestConfig IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + SuggestOptions IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeSuggestConfig(document.RootElement, options); + return DeserializeSuggestOptions(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(SuggestConfig)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(SuggestOptions)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static SuggestConfig FromResponse(Response response) + internal static SuggestOptions FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeSuggestConfig(document.RootElement); + return DeserializeSuggestOptions(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestConfig.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestOptions.cs similarity index 94% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestConfig.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestOptions.cs index e7460baf7ba85..869f90ded3d87 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestConfig.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/SuggestOptions.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The payload of suggest request. - public partial class SuggestConfig + public partial class SuggestOptions { /// /// Keeps track of any properties unknown to the library. @@ -45,12 +45,12 @@ public partial class SuggestConfig /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public SuggestConfig() + /// Initializes a new instance of . + public SuggestOptions() { } - /// Initializes a new instance of . + /// Initializes a new instance of . /// /// The keywords applied to all fields that support suggest operation. It must be /// at least 1 character, and no more than 100 characters. In the index schema we @@ -63,7 +63,7 @@ public SuggestConfig() /// /// The filter for the search. /// Keeps track of any properties unknown to the library. - internal SuggestConfig(string keywords, int? limit, BinaryData filter, IDictionary serializedAdditionalRawData) + internal SuggestOptions(string keywords, int? limit, BinaryData filter, IDictionary serializedAdditionalRawData) { Keywords = keywords; Limit = limit; diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.Serialization.cs index 15e1cfe742ec6..63aafd4f44ab8 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.Serialization.cs @@ -153,7 +153,7 @@ internal static TermTemplateDef DeserializeTermTemplateDef(JsonElement element, TypeCategory? category = default; long? createTime = default; string createdBy = default; - AtlasDateFormat dateFormatter = default; + DateFormat dateFormatter = default; string description = default; string guid = default; string name = default; @@ -198,7 +198,7 @@ internal static TermTemplateDef DeserializeTermTemplateDef(JsonElement element, { continue; } - dateFormatter = AtlasDateFormat.DeserializeAtlasDateFormat(property.Value, options); + dateFormatter = DateFormat.DeserializeDateFormat(property.Value, options); continue; } if (property.NameEquals("description"u8)) diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.cs index 593f4807ba4ac..b8e7e1fd4c463 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TermTemplateDef.cs @@ -69,7 +69,7 @@ public TermTemplateDef() /// ETag for concurrency control. /// An array of attribute definitions. /// Keeps track of any properties unknown to the library. - internal TermTemplateDef(TypeCategory? category, long? createTime, string createdBy, AtlasDateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IDictionary serializedAdditionalRawData) + internal TermTemplateDef(TypeCategory? category, long? createTime, string createdBy, DateFormat dateFormatter, string description, string guid, string name, IDictionary options, string serviceType, string typeVersion, long? updateTime, string updatedBy, long? version, string lastModifiedTS, IList attributeDefs, IDictionary serializedAdditionalRawData) { Category = category; CreateTime = createTime; @@ -96,7 +96,7 @@ internal TermTemplateDef(TypeCategory? category, long? createTime, string create /// The user who created the record. public string CreatedBy { get; set; } /// The date format. - public AtlasDateFormat DateFormatter { get; set; } + public DateFormat DateFormatter { get; set; } /// The description of the type definition. public string Description { get; set; } /// The GUID of the type definition. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTimeZone.Serialization.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TimeZone.Serialization.cs similarity index 77% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTimeZone.Serialization.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TimeZone.Serialization.cs index ac051248b3eff..6d0ac3d165153 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTimeZone.Serialization.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TimeZone.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.Analytics.Purview.DataMap { - public partial class AtlasTimeZone : IUtf8JsonSerializable, IJsonModel + public partial class TimeZone : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AtlasTimeZone)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(TimeZone)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -79,19 +79,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpt writer.WriteEndObject(); } - AtlasTimeZone IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + TimeZone IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(AtlasTimeZone)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(TimeZone)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAtlasTimeZone(document.RootElement, options); + return DeserializeTimeZone(document.RootElement, options); } - internal static AtlasTimeZone DeserializeAtlasTimeZone(JsonElement element, ModelReaderWriterOptions options = null) + internal static TimeZone DeserializeTimeZone(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -102,7 +102,7 @@ internal static AtlasTimeZone DeserializeAtlasTimeZone(JsonElement element, Mode int? dstSavings = default; string id = default; IList availableIds = default; - AtlasTimeZone @default = default; + TimeZone @default = default; string displayName = default; int? rawOffset = default; IDictionary serializedAdditionalRawData = default; @@ -143,7 +143,7 @@ internal static AtlasTimeZone DeserializeAtlasTimeZone(JsonElement element, Mode { continue; } - @default = DeserializeAtlasTimeZone(property.Value, options); + @default = DeserializeTimeZone(property.Value, options); continue; } if (property.NameEquals("displayName"u8)) @@ -166,7 +166,7 @@ internal static AtlasTimeZone DeserializeAtlasTimeZone(JsonElement element, Mode } } serializedAdditionalRawData = rawDataDictionary; - return new AtlasTimeZone( + return new TimeZone( dstSavings, id, availableIds ?? new ChangeTrackingList(), @@ -176,43 +176,43 @@ internal static AtlasTimeZone DeserializeAtlasTimeZone(JsonElement element, Mode serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(AtlasTimeZone)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(TimeZone)} does not support writing '{options.Format}' format."); } } - AtlasTimeZone IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + TimeZone IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeAtlasTimeZone(document.RootElement, options); + return DeserializeTimeZone(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(AtlasTimeZone)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(TimeZone)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AtlasTimeZone FromResponse(Response response) + internal static TimeZone FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeAtlasTimeZone(document.RootElement); + return DeserializeTimeZone(document.RootElement); } /// Convert into a . diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTimeZone.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TimeZone.cs similarity index 86% rename from sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTimeZone.cs rename to sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TimeZone.cs index 149b7df6ab4f5..287b4374a8f46 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/AtlasTimeZone.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/src/Generated/TimeZone.cs @@ -11,7 +11,7 @@ namespace Azure.Analytics.Purview.DataMap { /// The timezone information. - public partial class AtlasTimeZone + public partial class TimeZone { /// /// Keeps track of any properties unknown to the library. @@ -45,13 +45,13 @@ public partial class AtlasTimeZone /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - public AtlasTimeZone() + /// Initializes a new instance of . + public TimeZone() { AvailableIds = new ChangeTrackingList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The value of the daylight saving time. /// The ID of the timezone. /// An array of available IDs. @@ -59,7 +59,7 @@ public AtlasTimeZone() /// The display name of the timezone. /// The raw offset of the timezone. /// Keeps track of any properties unknown to the library. - internal AtlasTimeZone(int? dstSavings, string id, IList availableIds, AtlasTimeZone @default, string displayName, int? rawOffset, IDictionary serializedAdditionalRawData) + internal TimeZone(int? dstSavings, string id, IList availableIds, TimeZone @default, string displayName, int? rawOffset, IDictionary serializedAdditionalRawData) { DstSavings = dstSavings; Id = id; @@ -77,7 +77,7 @@ internal AtlasTimeZone(int? dstSavings, string id, IList availableIds, A /// An array of available IDs. public IList AvailableIds { get; } /// The timezone information. - public AtlasTimeZone Default { get; set; } + public TimeZone Default { get; set; } /// The display name of the timezone. public string DisplayName { get; set; } /// The raw offset of the timezone. diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Discovery.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Discovery.cs index a4a0aebb4e846..b54701df2585c 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Discovery.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Discovery.cs @@ -54,8 +54,8 @@ public void Example_Discovery_Query_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - QueryConfig queryConfig = new QueryConfig(); - Response response = client.Query(queryConfig); + QueryOptions queryOptions = new QueryOptions(); + Response response = client.Query(queryOptions); } [Test] @@ -66,8 +66,8 @@ public async Task Example_Discovery_Query_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - QueryConfig queryConfig = new QueryConfig(); - Response response = await client.QueryAsync(queryConfig); + QueryOptions queryOptions = new QueryOptions(); + Response response = await client.QueryAsync(queryOptions); } [Test] @@ -272,7 +272,7 @@ public void Example_Discovery_Query_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - QueryConfig queryConfig = new QueryConfig + QueryOptions queryOptions = new QueryOptions { Keywords = "", Limit = 1234, @@ -295,7 +295,7 @@ public void Example_Discovery_Query_AllParameters_Convenience() Facet = default, }, }; - Response response = client.Query(queryConfig); + Response response = client.Query(queryOptions); } [Test] @@ -306,7 +306,7 @@ public async Task Example_Discovery_Query_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - QueryConfig queryConfig = new QueryConfig + QueryOptions queryOptions = new QueryOptions { Keywords = "", Limit = 1234, @@ -329,7 +329,7 @@ public async Task Example_Discovery_Query_AllParameters_Convenience_Async() Facet = default, }, }; - Response response = await client.QueryAsync(queryConfig); + Response response = await client.QueryAsync(queryOptions); } [Test] @@ -370,8 +370,8 @@ public void Example_Discovery_Suggest_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - SuggestConfig suggestConfig = new SuggestConfig(); - Response response = client.Suggest(suggestConfig); + SuggestOptions suggestOptions = new SuggestOptions(); + Response response = client.Suggest(suggestOptions); } [Test] @@ -382,8 +382,8 @@ public async Task Example_Discovery_Suggest_ShortVersion_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - SuggestConfig suggestConfig = new SuggestConfig(); - Response response = await client.SuggestAsync(suggestConfig); + SuggestOptions suggestOptions = new SuggestOptions(); + Response response = await client.SuggestAsync(suggestOptions); } [Test] @@ -484,13 +484,13 @@ public void Example_Discovery_Suggest_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - SuggestConfig suggestConfig = new SuggestConfig + SuggestOptions suggestOptions = new SuggestOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; - Response response = client.Suggest(suggestConfig); + Response response = client.Suggest(suggestOptions); } [Test] @@ -501,13 +501,13 @@ public async Task Example_Discovery_Suggest_AllParameters_Convenience_Async() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - SuggestConfig suggestConfig = new SuggestConfig + SuggestOptions suggestOptions = new SuggestOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; - Response response = await client.SuggestAsync(suggestConfig); + Response response = await client.SuggestAsync(suggestOptions); } [Test] @@ -548,8 +548,8 @@ public void Example_Discovery_AutoComplete_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig(); - Response response = client.AutoComplete(autoCompleteConfig); + AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions(); + Response response = client.AutoComplete(autoCompleteOptions); } [Test] @@ -560,8 +560,8 @@ public async Task Example_Discovery_AutoComplete_ShortVersion_Convenience_Async( TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig(); - Response response = await client.AutoCompleteAsync(autoCompleteConfig); + AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions(); + Response response = await client.AutoCompleteAsync(autoCompleteOptions); } [Test] @@ -614,13 +614,13 @@ public void Example_Discovery_AutoComplete_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig + AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; - Response response = client.AutoComplete(autoCompleteConfig); + Response response = client.AutoComplete(autoCompleteOptions); } [Test] @@ -631,13 +631,13 @@ public async Task Example_Discovery_AutoComplete_AllParameters_Convenience_Async TokenCredential credential = new DefaultAzureCredential(); Discovery client = new DataMapClient(endpoint, credential).GetDiscoveryClient(apiVersion: "2023-09-01"); - AutoCompleteConfig autoCompleteConfig = new AutoCompleteConfig + AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions { Keywords = "", Limit = 1234, Filter = BinaryData.FromObjectAsJson(new object()), }; - Response response = await client.AutoCompleteAsync(autoCompleteConfig); + Response response = await client.AutoCompleteAsync(autoCompleteOptions); } } } diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Entity.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Entity.cs index f6bd75abe0daa..9ed072ad55583 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Entity.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_Entity.cs @@ -1639,8 +1639,8 @@ public void Example_Entity_AddClassification_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); - ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig(); - Response response = client.AddClassification(classificationAssociateConfig); + ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions(); + Response response = client.AddClassification(classificationAssociateOptions); } [Test] @@ -1651,8 +1651,8 @@ public async Task Example_Entity_AddClassification_ShortVersion_Convenience_Asyn TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); - ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig(); - Response response = await client.AddClassificationAsync(classificationAssociateConfig); + ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions(); + Response response = await client.AddClassificationAsync(classificationAssociateOptions); } [Test] @@ -1745,7 +1745,7 @@ public void Example_Entity_AddClassification_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); - ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig + ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions { Classification = new AtlasClassification { @@ -1767,7 +1767,7 @@ public void Example_Entity_AddClassification_AllParameters_Convenience() }, EntityGuids = { "" }, }; - Response response = client.AddClassification(classificationAssociateConfig); + Response response = client.AddClassification(classificationAssociateOptions); } [Test] @@ -1778,7 +1778,7 @@ public async Task Example_Entity_AddClassification_AllParameters_Convenience_Asy TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(); - ClassificationAssociateConfig classificationAssociateConfig = new ClassificationAssociateConfig + ClassificationAssociateOptions classificationAssociateOptions = new ClassificationAssociateOptions { Classification = new AtlasClassification { @@ -1800,7 +1800,7 @@ public async Task Example_Entity_AddClassification_AllParameters_Convenience_Asy }, EntityGuids = { "" }, }; - Response response = await client.AddClassificationAsync(classificationAssociateConfig); + Response response = await client.AddClassificationAsync(classificationAssociateOptions); } [Test] @@ -6837,8 +6837,8 @@ public void Example_Entity_MoveEntitiesToCollection_ShortVersion_Convenience() TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); - MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig(); - Response response = client.MoveEntitiesToCollection("", moveEntitiesConfig); + MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions(); + Response response = client.MoveEntitiesToCollection("", moveEntitiesOptions); } [Test] @@ -6849,8 +6849,8 @@ public async Task Example_Entity_MoveEntitiesToCollection_ShortVersion_Convenien TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); - MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig(); - Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesConfig); + MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions(); + Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesOptions); } [Test] @@ -7015,11 +7015,11 @@ public void Example_Entity_MoveEntitiesToCollection_AllParameters_Convenience() TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); - MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig + MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions { EntityGuids = { "" }, }; - Response response = client.MoveEntitiesToCollection("", moveEntitiesConfig); + Response response = client.MoveEntitiesToCollection("", moveEntitiesOptions); } [Test] @@ -7030,11 +7030,11 @@ public async Task Example_Entity_MoveEntitiesToCollection_AllParameters_Convenie TokenCredential credential = new DefaultAzureCredential(); Entity client = new DataMapClient(endpoint, credential).GetEntityClient(apiVersion: "2023-09-01"); - MoveEntitiesConfig moveEntitiesConfig = new MoveEntitiesConfig + MoveEntitiesOptions moveEntitiesOptions = new MoveEntitiesOptions { EntityGuids = { "" }, }; - Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesConfig); + Response response = await client.MoveEntitiesToCollectionAsync("", moveEntitiesOptions); } } } diff --git a/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_TypeDefinition.cs b/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_TypeDefinition.cs index fc5362b59749d..32058b3473c94 100644 --- a/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_TypeDefinition.cs +++ b/sdk/purview/Azure.Analytics.Purview.DataMap/tests/Generated/Samples/Samples_TypeDefinition.cs @@ -5072,7 +5072,7 @@ public void Example_TypeDefinition_BatchCreate_AllParameters_Convenience() Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", -DateFormatter = new AtlasDateFormat +DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -5080,7 +5080,7 @@ public void Example_TypeDefinition_BatchCreate_AllParameters_Convenience() DateTimeInstance = default, Instance = default, Lenient = true, -NumberFormat = new AtlasNumberFormat +NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -5098,7 +5098,7 @@ public void Example_TypeDefinition_BatchCreate_AllParameters_Convenience() RoundingMode = RoundingMode.Up, }, TimeInstance = default, -TimeZone = new AtlasTimeZone +TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -5337,7 +5337,7 @@ public async Task Example_TypeDefinition_BatchCreate_AllParameters_Convenience_A Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", -DateFormatter = new AtlasDateFormat +DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -5345,7 +5345,7 @@ public async Task Example_TypeDefinition_BatchCreate_AllParameters_Convenience_A DateTimeInstance = default, Instance = default, Lenient = true, -NumberFormat = new AtlasNumberFormat +NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -5363,7 +5363,7 @@ public async Task Example_TypeDefinition_BatchCreate_AllParameters_Convenience_A RoundingMode = RoundingMode.Up, }, TimeInstance = default, -TimeZone = new AtlasTimeZone +TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -6974,7 +6974,7 @@ public void Example_TypeDefinition_BatchUpdate_AllParameters_Convenience() Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", -DateFormatter = new AtlasDateFormat +DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -6982,7 +6982,7 @@ public void Example_TypeDefinition_BatchUpdate_AllParameters_Convenience() DateTimeInstance = default, Instance = default, Lenient = true, -NumberFormat = new AtlasNumberFormat +NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -7000,7 +7000,7 @@ public void Example_TypeDefinition_BatchUpdate_AllParameters_Convenience() RoundingMode = RoundingMode.Up, }, TimeInstance = default, -TimeZone = new AtlasTimeZone +TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -7239,7 +7239,7 @@ public async Task Example_TypeDefinition_BatchUpdate_AllParameters_Convenience_A Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", -DateFormatter = new AtlasDateFormat +DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -7247,7 +7247,7 @@ public async Task Example_TypeDefinition_BatchUpdate_AllParameters_Convenience_A DateTimeInstance = default, Instance = default, Lenient = true, -NumberFormat = new AtlasNumberFormat +NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -7265,7 +7265,7 @@ public async Task Example_TypeDefinition_BatchUpdate_AllParameters_Convenience_A RoundingMode = RoundingMode.Up, }, TimeInstance = default, -TimeZone = new AtlasTimeZone +TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -8208,7 +8208,7 @@ public void Example_TypeDefinition_BatchDelete_AllParameters_Convenience() Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", -DateFormatter = new AtlasDateFormat +DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -8216,7 +8216,7 @@ public void Example_TypeDefinition_BatchDelete_AllParameters_Convenience() DateTimeInstance = default, Instance = default, Lenient = true, -NumberFormat = new AtlasNumberFormat +NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -8234,7 +8234,7 @@ public void Example_TypeDefinition_BatchDelete_AllParameters_Convenience() RoundingMode = RoundingMode.Up, }, TimeInstance = default, -TimeZone = new AtlasTimeZone +TimeZone = new TimeZone { DstSavings = 1234, Id = "", @@ -8473,7 +8473,7 @@ public async Task Example_TypeDefinition_BatchDelete_AllParameters_Convenience_A Category = TypeCategory.Primitive, CreateTime = 1234L, CreatedBy = "", -DateFormatter = new AtlasDateFormat +DateFormatter = new DateFormat { AvailableLocales = {""}, Calendar = 123.45F, @@ -8481,7 +8481,7 @@ public async Task Example_TypeDefinition_BatchDelete_AllParameters_Convenience_A DateTimeInstance = default, Instance = default, Lenient = true, -NumberFormat = new AtlasNumberFormat +NumberFormat = new NumberFormat { AvailableLocales = {""}, Currency = "", @@ -8499,7 +8499,7 @@ public async Task Example_TypeDefinition_BatchDelete_AllParameters_Convenience_A RoundingMode = RoundingMode.Up, }, TimeInstance = default, -TimeZone = new AtlasTimeZone +TimeZone = new TimeZone { DstSavings = 1234, Id = "",