Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update generated code. #247

Merged
merged 3 commits into from
Feb 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
19 changes: 10 additions & 9 deletions src/generated/Admin/AdminRequestBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public Command BuildGetCommand() {
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
var outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
var outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
IOutputFilter outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
var cancellationToken = invocationContext.GetCancellationToken();
var requestInfo = ToGetRequestInformation(q => {
q.QueryParameters.Select = select;
Expand All @@ -72,8 +72,8 @@ public Command BuildGetCommand() {
{"4XX", ODataError.CreateFromDiscriminatorValue},
{"5XX", ODataError.CreateFromDiscriminatorValue},
};
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken);
response = await outputFilter?.FilterOutputAsync(response, query, cancellationToken) ?? response;
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
var formatter = outputFormatterFactory.GetFormatter(output);
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
Expand Down Expand Up @@ -105,24 +105,25 @@ public Command BuildPatchCommand() {
}, description: "Disable indentation for the JSON output formatter.");
command.AddOption(jsonNoIndentOption);
command.SetHandler(async (invocationContext) => {
var body = invocationContext.ParseResult.GetValueForOption(bodyOption);
var body = invocationContext.ParseResult.GetValueForOption(bodyOption) ?? string.Empty;
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
var outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
var outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
IOutputFilter outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
var cancellationToken = invocationContext.GetCancellationToken();
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
var model = parseNode.GetObjectValue<ApiSdk.Models.Admin>(ApiSdk.Models.Admin.CreateFromDiscriminatorValue);
if (model is null) return; // Cannot create a POST request from a null model.
var requestInfo = ToPatchRequestInformation(model, q => {
});
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
{"4XX", ODataError.CreateFromDiscriminatorValue},
{"5XX", ODataError.CreateFromDiscriminatorValue},
};
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken);
response = await outputFilter?.FilterOutputAsync(response, query, cancellationToken) ?? response;
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
var formatter = outputFormatterFactory.GetFormatter(output);
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Command BuildGetCommand() {
command.SetHandler(async (invocationContext) => {
var search = invocationContext.ParseResult.GetValueForOption(searchOption);
var filter = invocationContext.ParseResult.GetValueForOption(filterOption);
var outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
var cancellationToken = invocationContext.GetCancellationToken();
var requestInfo = ToGetRequestInformation(q => {
if (!string.IsNullOrEmpty(search)) q.QueryParameters.Search = search;
Expand All @@ -51,7 +51,7 @@ public Command BuildGetCommand() {
{"4XX", ODataError.CreateFromDiscriminatorValue},
{"5XX", ODataError.CreateFromDiscriminatorValue},
};
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken);
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
var formatter = outputFormatterFactory.GetFormatter(FormatterType.TEXT);
await formatter.WriteOutputAsync(response, null, cancellationToken);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,25 @@ public Command BuildCreateCommand() {
}, description: "Disable indentation for the JSON output formatter.");
command.AddOption(jsonNoIndentOption);
command.SetHandler(async (invocationContext) => {
var body = invocationContext.ParseResult.GetValueForOption(bodyOption);
var body = invocationContext.ParseResult.GetValueForOption(bodyOption) ?? string.Empty;
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
var outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
var outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
IOutputFilter outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
var cancellationToken = invocationContext.GetCancellationToken();
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
var model = parseNode.GetObjectValue<ServiceHealth>(ServiceHealth.CreateFromDiscriminatorValue);
if (model is null) return; // Cannot create a POST request from a null model.
var requestInfo = ToPostRequestInformation(model, q => {
});
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
{"4XX", ODataError.CreateFromDiscriminatorValue},
{"5XX", ODataError.CreateFromDiscriminatorValue},
};
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken);
response = await outputFilter?.FilterOutputAsync(response, query, cancellationToken) ?? response;
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
var formatter = outputFormatterFactory.GetFormatter(output);
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
Expand All @@ -103,7 +104,7 @@ public Command BuildCreateCommand() {
/// </summary>
public Command BuildListCommand() {
var command = new Command("list");
command.Description = "Retrieve the serviceHealth resources from the **healthOverviews** navigation property. This operation provides the health report of all subscribed services for a tenant.";
command.Description = "Retrieve the serviceHealth resources from the **healthOverviews** navigation property. This operation provides the health report of all subscribed services for a tenant.\n\nFind more info here:\n https://docs.microsoft.com/graph/api/serviceannouncement-list-healthoverviews?view=graph-rest-1.0";
// Create options for all the parameters
var topOption = new Option<int?>("--top", description: "Show only the first n items") {
};
Expand Down Expand Up @@ -168,9 +169,9 @@ public Command BuildListCommand() {
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
var all = invocationContext.ParseResult.GetValueForOption(allOption);
var outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
var outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
var pagingService = invocationContext.BindingContext.GetRequiredService<IPagingService>();
IOutputFilter outputFilter = invocationContext.BindingContext.GetRequiredService<IOutputFilter>();
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
IPagingService pagingService = invocationContext.BindingContext.GetRequiredService<IPagingService>();
var cancellationToken = invocationContext.GetCancellationToken();
var requestInfo = ToGetRequestInformation(q => {
q.QueryParameters.Top = top;
Expand All @@ -193,7 +194,7 @@ public Command BuildListCommand() {
IOutputFormatter? formatter = null;
if (pageResponse?.StatusCode >= 200 && pageResponse?.StatusCode < 300) {
formatter = outputFormatterFactory.GetFormatter(output);
response = await outputFilter?.FilterOutputAsync(response, query, cancellationToken) ?? response;
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
} else {
formatter = outputFormatterFactory.GetFormatter(FormatterType.TEXT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ public Command BuildGetCommand() {
var serviceHealthId = invocationContext.ParseResult.GetValueForOption(serviceHealthIdOption);
var search = invocationContext.ParseResult.GetValueForOption(searchOption);
var filter = invocationContext.ParseResult.GetValueForOption(filterOption);
var outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetRequiredService<IOutputFormatterFactory>();
var cancellationToken = invocationContext.GetCancellationToken();
var requestInfo = ToGetRequestInformation(q => {
if (!string.IsNullOrEmpty(search)) q.QueryParameters.Search = search;
if (!string.IsNullOrEmpty(filter)) q.QueryParameters.Filter = filter;
});
requestInfo.PathParameters.Add("serviceHealth%2Did", serviceHealthId);
if (serviceHealthId is not null) requestInfo.PathParameters.Add("serviceHealth%2Did", serviceHealthId);
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
{"4XX", ODataError.CreateFromDiscriminatorValue},
{"5XX", ODataError.CreateFromDiscriminatorValue},
};
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken);
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
var formatter = outputFormatterFactory.GetFormatter(FormatterType.TEXT);
await formatter.WriteOutputAsync(response, null, cancellationToken);
});
Expand Down
Loading