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.

Sign up for GitHub

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

Jump to bottom

Update generated code. #372

Merged
merged 3 commits into from
Oct 23, 2023
Merged

Update generated code. #372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c0b3db
Update generated code.
calebkiage Oct 19, 2023
fc46bca
Update graph cli core (#373)
calebkiage Oct 22, 2023
212ed76
Update graph cli core (#376)
calebkiage Oct 23, 2023
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.
62 changes: 33 additions & 29 deletions src/generated/Admin/AdminRequestBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// <auto-generated/>
using ApiSdk.Admin.Edge;
using ApiSdk.Admin.People;
using ApiSdk.Admin.ServiceAnnouncement;
using ApiSdk.Admin.Sharepoint;
using ApiSdk.Models.ODataErrors;
Expand Down Expand Up @@ -61,25 +62,15 @@ public Command BuildGetCommand() {
};
expandOption.IsRequired = false;
command.AddOption(expandOption);
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
IsRequired = true
};
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
command.AddOption(outputOption);
var queryOption = new Option<string>("--query");
command.AddOption(queryOption);
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
return value;
}
return true;
}, description: "Disable indentation for the JSON output formatter.");
command.AddOption(jsonNoIndentOption);
command.SetHandler(async (invocationContext) => {
var select = invocationContext.ParseResult.GetValueForOption(selectOption);
var expand = invocationContext.ParseResult.GetValueForOption(expandOption);
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
var cancellationToken = invocationContext.GetCancellationToken();
Expand All @@ -94,9 +85,8 @@ public Command BuildGetCommand() {
};
var response = await reqAdapter.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);
await formatter.WriteOutputAsync(response, cancellationToken);
});
return command;
}
Expand All @@ -110,32 +100,25 @@ public Command BuildPatchCommand() {
};
bodyOption.IsRequired = true;
command.AddOption(bodyOption);
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
IsRequired = true
};
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
command.AddOption(outputOption);
var queryOption = new Option<string>("--query");
command.AddOption(queryOption);
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
return value;
}
return true;
}, description: "Disable indentation for the JSON output formatter.");
command.AddOption(jsonNoIndentOption);
command.SetHandler(async (invocationContext) => {
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);
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
var cancellationToken = invocationContext.GetCancellationToken();
var reqAdapter = invocationContext.GetRequestAdapter();
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.
if (model is null) {
Console.Error.WriteLine("No model data to send.");
return;
}
var requestInfo = ToPatchRequestInformation(model, q => {
});
requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
Expand All @@ -145,13 +128,34 @@ public Command BuildPatchCommand() {
};
var response = await reqAdapter.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);
await formatter.WriteOutputAsync(response, cancellationToken);
});
return command;
}
/// <summary>
/// Provides operations to manage the people property of the microsoft.graph.admin entity.
/// </summary>
public Command BuildPeopleNavCommand() {
var command = new Command("people");
command.Description = "Provides operations to manage the people property of the microsoft.graph.admin entity.";
var builder = new PeopleRequestBuilder(PathParameters);
var execCommands = new List<Command>();
var nonExecCommands = new List<Command>();
execCommands.Add(builder.BuildGetCommand());
execCommands.Add(builder.BuildPatchCommand());
nonExecCommands.Add(builder.BuildProfileCardPropertiesNavCommand());
foreach (var cmd in execCommands)
{
command.AddCommand(cmd);
}
foreach (var cmd in nonExecCommands)
{
command.AddCommand(cmd);
}
return command;
}
/// <summary>
/// Provides operations to manage the serviceAnnouncement property of the microsoft.graph.admin entity.
/// </summary>
public Command BuildServiceAnnouncementNavCommand() {
Expand Down Expand Up @@ -227,14 +231,14 @@ public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<Ad
UrlTemplate = UrlTemplate,
PathParameters = PathParameters,
};
requestInfo.Headers.Add("Accept", "application/json");
if (requestConfiguration != null) {
var requestConfig = new RequestConfiguration<AdminRequestBuilderGetQueryParameters>();
requestConfiguration.Invoke(requestConfig);
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
requestInfo.AddRequestOptions(requestConfig.Options);
requestInfo.AddHeaders(requestConfig.Headers);
}
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
return requestInfo;
}
/// <summary>
Expand All @@ -255,14 +259,14 @@ public RequestInformation ToPatchRequestInformation(ApiSdk.Models.Admin body, Ac
UrlTemplate = UrlTemplate,
PathParameters = PathParameters,
};
requestInfo.Headers.Add("Accept", "application/json");
if (requestConfiguration != null) {
var requestConfig = new RequestConfiguration<DefaultQueryParameters>();
requestConfiguration.Invoke(requestConfig);
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
requestInfo.AddRequestOptions(requestConfig.Options);
requestInfo.AddHeaders(requestConfig.Headers);
}
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
return requestInfo;
}
/// <summary>
Expand Down
40 changes: 11 additions & 29 deletions src/generated/Admin/Edge/EdgeRequestBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,15 @@ public Command BuildGetCommand() {
};
expandOption.IsRequired = false;
command.AddOption(expandOption);
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
IsRequired = true
};
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
command.AddOption(outputOption);
var queryOption = new Option<string>("--query");
command.AddOption(queryOption);
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
return value;
}
return true;
}, description: "Disable indentation for the JSON output formatter.");
command.AddOption(jsonNoIndentOption);
command.SetHandler(async (invocationContext) => {
var select = invocationContext.ParseResult.GetValueForOption(selectOption);
var expand = invocationContext.ParseResult.GetValueForOption(expandOption);
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
var cancellationToken = invocationContext.GetCancellationToken();
Expand All @@ -96,9 +86,8 @@ public Command BuildGetCommand() {
};
var response = await reqAdapter.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);
await formatter.WriteOutputAsync(response, cancellationToken);
});
return command;
}
Expand Down Expand Up @@ -135,32 +124,25 @@ public Command BuildPatchCommand() {
};
bodyOption.IsRequired = true;
command.AddOption(bodyOption);
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
IsRequired = true
};
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
command.AddOption(outputOption);
var queryOption = new Option<string>("--query");
command.AddOption(queryOption);
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
return value;
}
return true;
}, description: "Disable indentation for the JSON output formatter.");
command.AddOption(jsonNoIndentOption);
command.SetHandler(async (invocationContext) => {
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);
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
var cancellationToken = invocationContext.GetCancellationToken();
var reqAdapter = invocationContext.GetRequestAdapter();
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
var model = parseNode.GetObjectValue<ApiSdk.Models.Edge>(ApiSdk.Models.Edge.CreateFromDiscriminatorValue);
if (model is null) return; // Cannot create a POST request from a null model.
if (model is null) {
Console.Error.WriteLine("No model data to send.");
return;
}
var requestInfo = ToPatchRequestInformation(model, q => {
});
requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
Expand All @@ -170,9 +152,8 @@ public Command BuildPatchCommand() {
};
var response = await reqAdapter.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);
await formatter.WriteOutputAsync(response, cancellationToken);
});
return command;
}
Expand Down Expand Up @@ -211,6 +192,7 @@ public RequestInformation ToDeleteRequestInformation(Action<RequestConfiguration
requestInfo.AddRequestOptions(requestConfig.Options);
requestInfo.AddHeaders(requestConfig.Headers);
}
requestInfo.Headers.TryAdd("Accept", "application/json, application/json");
return requestInfo;
}
/// <summary>
Expand All @@ -229,14 +211,14 @@ public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<Ed
UrlTemplate = UrlTemplate,
PathParameters = PathParameters,
};
requestInfo.Headers.Add("Accept", "application/json");
if (requestConfiguration != null) {
var requestConfig = new RequestConfiguration<EdgeRequestBuilderGetQueryParameters>();
requestConfiguration.Invoke(requestConfig);
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
requestInfo.AddRequestOptions(requestConfig.Options);
requestInfo.AddHeaders(requestConfig.Headers);
}
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
return requestInfo;
}
/// <summary>
Expand All @@ -257,14 +239,14 @@ public RequestInformation ToPatchRequestInformation(ApiSdk.Models.Edge body, Act
UrlTemplate = UrlTemplate,
PathParameters = PathParameters,
};
requestInfo.Headers.Add("Accept", "application/json");
if (requestConfiguration != null) {
var requestConfig = new RequestConfiguration<DefaultQueryParameters>();
requestConfiguration.Invoke(requestConfig);
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
requestInfo.AddRequestOptions(requestConfig.Options);
requestInfo.AddHeaders(requestConfig.Headers);
}
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
return requestInfo;
}
/// <summary>
Expand Down
Loading
Loading