From 10be768e2287abf43bf99f5d03e4f8044c2f6b96 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 6 Oct 2021 14:23:57 -0400 Subject: [PATCH 01/14] - fixes debug configuration for dotnet sample Signed-off-by: Vincent Biret --- msgraph-mail/dotnet/.vscode/tasks.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/msgraph-mail/dotnet/.vscode/tasks.json b/msgraph-mail/dotnet/.vscode/tasks.json index 1563eed50..9aa148e04 100644 --- a/msgraph-mail/dotnet/.vscode/tasks.json +++ b/msgraph-mail/dotnet/.vscode/tasks.json @@ -6,18 +6,14 @@ { "label": "build", "command": "dotnet", - "type": "shell", + "type": "process", "args": [ - "build", - // Ask dotnet build to generate full paths for file names. - "/property:GenerateFullPaths=true", - // Do not generate summary otherwise it leads to duplicate errors in Problems panel - "/consoleloggerparameters:NoSummary" - ], + "build", + "${workspaceFolder}/dotnet.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], "group": "build", - "presentation": { - "reveal": "silent" - }, "problemMatcher": "$msCompile" } ] From f3053224874c916c5ffa61824f699379235fa864 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 6 Oct 2021 14:24:14 -0400 Subject: [PATCH 02/14] - adds solution for dotnet sample Signed-off-by: Vincent Biret --- msgraph-mail/dotnet/dotnet.sln | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 msgraph-mail/dotnet/dotnet.sln diff --git a/msgraph-mail/dotnet/dotnet.sln b/msgraph-mail/dotnet/dotnet.sln new file mode 100644 index 000000000..49efa15f9 --- /dev/null +++ b/msgraph-mail/dotnet/dotnet.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet", "dotnet.csproj", "{86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Debug|x64.ActiveCfg = Debug|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Debug|x64.Build.0 = Debug|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Debug|x86.ActiveCfg = Debug|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Debug|x86.Build.0 = Debug|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Release|x64.ActiveCfg = Release|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Release|x64.Build.0 = Release|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Release|x86.ActiveCfg = Release|Any CPU + {86FF1605-07DD-49EA-8ECF-D626E3E9A8DC}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal From 2aca8a010f6129809d08948a30b4af0b79f3e615 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 6 Oct 2021 14:24:50 -0400 Subject: [PATCH 03/14] - code-gen: dotnet URL template --- msgraph-mail/dotnet/ApiClient.cs | 15 ++++--- .../InferenceClassificationRequestBuilder.cs | 37 ++++++++------- ...nceClassificationOverrideRequestBuilder.cs | 35 +++++++-------- .../Overrides/OverridesRequestBuilder.cs | 36 +++++++-------- .../ChildFoldersRequestBuilder.cs | 36 +++++++-------- .../Item/MailFolderRequestBuilder.cs | 35 +++++++-------- .../Item/MailFolderRequestBuilder.cs | 45 +++++++++---------- .../Item/MessageRuleRequestBuilder.cs | 35 +++++++-------- .../MessageRulesRequestBuilder.cs | 36 +++++++-------- .../Attachments/AttachmentsRequestBuilder.cs | 36 +++++++-------- .../Item/AttachmentRequestBuilder.cs | 35 +++++++-------- .../Extensions/ExtensionsRequestBuilder.cs | 36 +++++++-------- .../Item/ExtensionRequestBuilder.cs | 35 +++++++-------- .../Messages/Item/MessageRequestBuilder.cs | 45 +++++++++---------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 35 +++++++-------- ...tiValueExtendedPropertiesRequestBuilder.cs | 36 +++++++-------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 35 +++++++-------- ...leValueExtendedPropertiesRequestBuilder.cs | 36 +++++++-------- .../Item/Value/ContentRequestBuilder.cs | 32 +++++++------ .../Item/Messages/MessagesRequestBuilder.cs | 36 +++++++-------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 35 +++++++-------- ...tiValueExtendedPropertiesRequestBuilder.cs | 36 +++++++-------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 35 +++++++-------- ...leValueExtendedPropertiesRequestBuilder.cs | 36 +++++++-------- .../MailFolders/MailFoldersRequestBuilder.cs | 36 +++++++-------- .../Attachments/AttachmentsRequestBuilder.cs | 36 +++++++-------- .../Item/AttachmentRequestBuilder.cs | 35 +++++++-------- .../Extensions/ExtensionsRequestBuilder.cs | 36 +++++++-------- .../Item/ExtensionRequestBuilder.cs | 35 +++++++-------- .../Messages/Item/MessageRequestBuilder.cs | 45 +++++++++---------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 35 +++++++-------- ...tiValueExtendedPropertiesRequestBuilder.cs | 36 +++++++-------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 35 +++++++-------- ...leValueExtendedPropertiesRequestBuilder.cs | 36 +++++++-------- .../Item/Value/ContentRequestBuilder.cs | 32 +++++++------ .../Item/Messages/MessagesRequestBuilder.cs | 36 +++++++-------- .../dotnet/Users/Item/UserRequestBuilder.cs | 32 ++++++------- .../dotnet/Users/UsersRequestBuilder.cs | 30 ++++++------- 38 files changed, 660 insertions(+), 684 deletions(-) diff --git a/msgraph-mail/dotnet/ApiClient.cs b/msgraph-mail/dotnet/ApiClient.cs index d724591d4..010d8c2a3 100644 --- a/msgraph-mail/dotnet/ApiClient.cs +++ b/msgraph-mail/dotnet/ApiClient.cs @@ -9,20 +9,23 @@ namespace Graphdotnetv4 { /// The main entry point of the SDK, exposes the configuration and the fluent API. public class ApiClient { - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } public UsersRequestBuilder Users { get => - new UsersRequestBuilder(PathSegment , RequestAdapter, false); + new UsersRequestBuilder(UrlTemplateParameters, RequestAdapter); } /// /// Instantiates a new ApiClient and sets the default values. - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. /// public ApiClient(IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "https://graph.microsoft.com/v1.0"; + UrlTemplateParameters = new Dictionary(); + UrlTemplate = "https://graph.microsoft.com/v1.0"; RequestAdapter = requestAdapter; ApiClientBuilder.RegisterDefaultSerializer(); ApiClientBuilder.RegisterDefaultDeserializer(); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs index 4072637e5..e9410473f 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs @@ -10,30 +10,26 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification public class InferenceClassificationRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } public OverridesRequestBuilder Overrides { get => - new OverridesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new OverridesRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new InferenceClassificationRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public InferenceClassificationRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public InferenceClassificationRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/inferenceClassification"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. @@ -43,8 +39,9 @@ public InferenceClassificationRequestBuilder(string currentPath, IRequestAdapter public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -58,8 +55,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -79,8 +77,9 @@ public RequestInformation CreatePatchRequestInformation(Graphdotnetv4.Models.Mic _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs index f5462f07f..25d0edd48 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs @@ -9,27 +9,23 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification.Overrides.Item { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification\overrides\{inferenceClassificationOverride-id} public class InferenceClassificationOverrideRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public InferenceClassificationOverrideRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public InferenceClassificationOverrideRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -39,8 +35,9 @@ public InferenceClassificationOverrideRequestBuilder(string currentPath, IReques public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(InferenceClassificationO _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs index bdb328999..20b849029 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification.Overrides { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification\overrides public class OverridesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.inferenceClassification.overrides.item collection public InferenceClassificationOverrideRequestBuilder this[string position] { get { - return new InferenceClassificationOverrideRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("inferenceClassificationOverride_id", position); + return new InferenceClassificationOverrideRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new OverridesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public OverridesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public OverridesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/overrides"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -45,8 +43,9 @@ public OverridesRequestBuilder(string currentPath, IRequestAdapter requestAdapte public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(InferenceClassificationOv _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs index 37d6d37e0..5531280e0 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.ChildFolders { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\childFolders public class ChildFoldersRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.childFolders.item collection public MailFolderRequestBuilder this[string position] { get { - return new MailFolderRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("mailFolder_id1", position); + return new MailFolderRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new ChildFoldersRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ChildFoldersRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ChildFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/childFolders"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of child folders in the mailFolder. @@ -45,8 +43,9 @@ public ChildFoldersRequestBuilder(string currentPath, IRequestAdapter requestAda public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(MailFolder body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\childFolders\{mailFolder-id1} public class MailFolderRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MailFolderRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MailFolderRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of child folders in the mailFolder. @@ -39,8 +35,9 @@ public MailFolderRequestBuilder(string currentPath, IRequestAdapter requestAdapt public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(MailFolder body, Action< _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs index 8e3b03b9e..fd1ae3845 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs @@ -15,41 +15,37 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id} public class MailFolderRequestBuilder { public ChildFoldersRequestBuilder ChildFolders { get => - new ChildFoldersRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new ChildFoldersRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } public MessageRulesRequestBuilder MessageRules { get => - new MessageRulesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MessageRulesRequestBuilder(UrlTemplateParameters, RequestAdapter); } public MessagesRequestBuilder Messages { get => - new MessagesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MessagesRequestBuilder(UrlTemplateParameters, RequestAdapter); } public MultiValueExtendedPropertiesRequestBuilder MultiValueExtendedProperties { get => - new MultiValueExtendedPropertiesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MultiValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => - new SingleValueExtendedPropertiesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new SingleValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MailFolderRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MailFolderRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The user's mail folders. Read-only. Nullable. @@ -59,8 +55,9 @@ public MailFolderRequestBuilder(string currentPath, IRequestAdapter requestAdapt public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -74,8 +71,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -95,8 +93,9 @@ public RequestInformation CreatePatchRequestInformation(MailFolder body, Action< _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs index 44301d5e8..26e5bb151 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs @@ -9,27 +9,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MessageRules.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messageRules\{messageRule-id} public class MessageRuleRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRuleRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessageRuleRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MessageRuleRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of rules that apply to the user's Inbox folder. @@ -39,8 +35,9 @@ public MessageRuleRequestBuilder(string currentPath, IRequestAdapter requestAdap public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(MessageRule body, Action _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs index 8055bc3dd..d3ecf6315 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MessageRules { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messageRules public class MessageRulesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messageRules.item collection public MessageRuleRequestBuilder this[string position] { get { - return new MessageRuleRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("messageRule_id", position); + return new MessageRuleRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MessageRulesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessageRulesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MessageRulesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/messageRules"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of rules that apply to the user's Inbox folder. @@ -45,8 +43,9 @@ public MessageRulesRequestBuilder(string currentPath, IRequestAdapter requestAda public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(MessageRule body, Action< _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs index d6c9cce94..da0b1e42b 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Attachments { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\attachments public class AttachmentsRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.attachments.item collection public AttachmentRequestBuilder this[string position] { get { - return new AttachmentRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("attachment_id", position); + return new AttachmentRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new AttachmentsRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public AttachmentsRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public AttachmentsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/attachments"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. @@ -45,8 +43,9 @@ public AttachmentsRequestBuilder(string currentPath, IRequestAdapter requestAdap public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(Attachment body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\attachments\{attachment-id} public class AttachmentRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new AttachmentRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public AttachmentRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public AttachmentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. @@ -39,8 +35,9 @@ public AttachmentRequestBuilder(string currentPath, IRequestAdapter requestAdapt public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(Attachment body, Action< _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index 619bb3b28..0431acbb5 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Extensions { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\extensions public class ExtensionsRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.extensions.item collection public ExtensionRequestBuilder this[string position] { get { - return new ExtensionRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("extension_id", position); + return new ExtensionRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new ExtensionsRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ExtensionsRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ExtensionsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/extensions"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. @@ -45,8 +43,9 @@ public ExtensionsRequestBuilder(string currentPath, IRequestAdapter requestAdapt public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\extensions\{extension-id} public class ExtensionRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ExtensionRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ExtensionRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ExtensionRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. @@ -39,8 +35,9 @@ public ExtensionRequestBuilder(string currentPath, IRequestAdapter requestAdapte public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id} public class MessageRequestBuilder { public AttachmentsRequestBuilder Attachments { get => - new AttachmentsRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new AttachmentsRequestBuilder(UrlTemplateParameters, RequestAdapter); } public ContentRequestBuilder Content { get => - new ContentRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new ContentRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Current path for the request - private string CurrentPath { get; set; } public ExtensionsRequestBuilder Extensions { get => - new ExtensionsRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new ExtensionsRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } public MultiValueExtendedPropertiesRequestBuilder MultiValueExtendedProperties { get => - new MultiValueExtendedPropertiesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MultiValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => - new SingleValueExtendedPropertiesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new SingleValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessageRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of messages in the mailFolder. @@ -59,8 +55,9 @@ public MessageRequestBuilder(string currentPath, IRequestAdapter requestAdapter, public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -74,8 +71,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -95,8 +93,9 @@ public RequestInformation CreatePatchRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. @@ -39,8 +35,9 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string currentPath, IReque public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(MultiValueLegacyExtended _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 340f50b42..cda7f62d2 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - return new MultiValueLegacyExtendedPropertyRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/multiValueExtendedProperties"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. @@ -45,8 +43,9 @@ public MultiValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAd public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(MultiValueLegacyExtendedP _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 1bb778027..87017286b 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -9,27 +9,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.SingleValueExtendedProperties.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public SingleValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. @@ -39,8 +35,9 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequ public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(SingleValueLegacyExtende _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 6d69ccc96..62c416d1d 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - return new SingleValueLegacyExtendedPropertyRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public SingleValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public SingleValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/singleValueExtendedProperties"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. @@ -45,8 +43,9 @@ public SingleValueExtendedPropertiesRequestBuilder(string currentPath, IRequestA public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(SingleValueLegacyExtended _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs index d3203e8b7..8e75e5571 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -8,27 +8,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Value { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\$value public class ContentRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ContentRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ContentRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ContentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/$value"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// Get media content for the navigation property messages from users @@ -38,8 +34,9 @@ public ContentRequestBuilder(string currentPath, IRequestAdapter requestAdapter, public RequestInformation CreateGetRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreatePutRequestInformation(Stream body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages public class MessagesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item collection public MessageRequestBuilder this[string position] { get { - return new MessageRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("message_id", position); + return new MessageRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MessagesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessagesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MessagesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/messages"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of messages in the mailFolder. @@ -45,8 +43,9 @@ public MessagesRequestBuilder(string currentPath, IRequestAdapter requestAdapter public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -39,8 +35,9 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string currentPath, IReque public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(MultiValueLegacyExtended _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 3ee84664f..0c0de068f 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - return new MultiValueLegacyExtendedPropertyRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/multiValueExtendedProperties"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -45,8 +43,9 @@ public MultiValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAd public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(MultiValueLegacyExtendedP _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 1d4020da6..ebd1eb231 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -9,27 +9,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.SingleValueExtendedProperties.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public SingleValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -39,8 +35,9 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequ public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(SingleValueLegacyExtende _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 75a1e564e..fd3d43826 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - return new SingleValueLegacyExtendedPropertyRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public SingleValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public SingleValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/singleValueExtendedProperties"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -45,8 +43,9 @@ public SingleValueExtendedPropertiesRequestBuilder(string currentPath, IRequestA public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(SingleValueLegacyExtended _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs index 420a06381..91b76fab7 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders { /// Builds and executes requests for operations under \users\{user-id}\mailFolders public class MailFoldersRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item collection public MailFolderRequestBuilder this[string position] { get { - return new MailFolderRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("mailFolder_id", position); + return new MailFolderRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MailFoldersRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MailFoldersRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MailFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/mailFolders"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The user's mail folders. Read-only. Nullable. @@ -45,8 +43,9 @@ public MailFoldersRequestBuilder(string currentPath, IRequestAdapter requestAdap public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(MailFolder body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\attachments public class AttachmentsRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.attachments.item collection public AttachmentRequestBuilder this[string position] { get { - return new AttachmentRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("attachment_id", position); + return new AttachmentRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new AttachmentsRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public AttachmentsRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public AttachmentsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/attachments"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. @@ -45,8 +43,9 @@ public AttachmentsRequestBuilder(string currentPath, IRequestAdapter requestAdap public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(Attachment body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\attachments\{attachment-id} public class AttachmentRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new AttachmentRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public AttachmentRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public AttachmentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. @@ -39,8 +35,9 @@ public AttachmentRequestBuilder(string currentPath, IRequestAdapter requestAdapt public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(Attachment body, Action< _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index a02cbd99e..e6f57124e 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Extensions { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\extensions public class ExtensionsRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.extensions.item collection public ExtensionRequestBuilder this[string position] { get { - return new ExtensionRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("extension_id", position); + return new ExtensionRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new ExtensionsRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ExtensionsRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ExtensionsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/extensions"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. @@ -45,8 +43,9 @@ public ExtensionsRequestBuilder(string currentPath, IRequestAdapter requestAdapt public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\extensions\{extension-id} public class ExtensionRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ExtensionRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ExtensionRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ExtensionRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. @@ -39,8 +35,9 @@ public ExtensionRequestBuilder(string currentPath, IRequestAdapter requestAdapte public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id} public class MessageRequestBuilder { public AttachmentsRequestBuilder Attachments { get => - new AttachmentsRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new AttachmentsRequestBuilder(UrlTemplateParameters, RequestAdapter); } public ContentRequestBuilder Content { get => - new ContentRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new ContentRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Current path for the request - private string CurrentPath { get; set; } public ExtensionsRequestBuilder Extensions { get => - new ExtensionsRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new ExtensionsRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } public MultiValueExtendedPropertiesRequestBuilder MultiValueExtendedProperties { get => - new MultiValueExtendedPropertiesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MultiValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => - new SingleValueExtendedPropertiesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new SingleValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessageRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The messages in a mailbox or folder. Read-only. Nullable. @@ -59,8 +55,9 @@ public MessageRequestBuilder(string currentPath, IRequestAdapter requestAdapter, public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -74,8 +71,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -95,8 +93,9 @@ public RequestInformation CreatePatchRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. @@ -39,8 +35,9 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string currentPath, IReque public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(MultiValueLegacyExtended _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index f7d12d101..4d3585234 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - return new MultiValueLegacyExtendedPropertyRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/multiValueExtendedProperties"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. @@ -45,8 +43,9 @@ public MultiValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAd public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(MultiValueLegacyExtendedP _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index c78efbbcb..3988f3d7f 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -9,27 +9,23 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.SingleValueExtendedProperties.Item { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public SingleValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. @@ -39,8 +35,9 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string currentPath, IRequ public RequestInformation CreateDeleteRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.DELETE, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreateDeleteRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -75,8 +73,9 @@ public RequestInformation CreatePatchRequestInformation(SingleValueLegacyExtende _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 6d24e3072..d53315f08 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -10,31 +10,29 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - return new SingleValueLegacyExtendedPropertyRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public SingleValueExtendedPropertiesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public SingleValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/singleValueExtendedProperties"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. @@ -45,8 +43,9 @@ public SingleValueExtendedPropertiesRequestBuilder(string currentPath, IRequestA public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(SingleValueLegacyExtended _ = body ?? throw new ArgumentNullException(nameof(body)); var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs index 45de4d2c2..0dea9f8cd 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -8,27 +8,23 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Value { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\$value public class ContentRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ContentRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ContentRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public ContentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/$value"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// Get media content for the navigation property messages from users @@ -38,8 +34,9 @@ public ContentRequestBuilder(string currentPath, IRequestAdapter requestAdapter, public RequestInformation CreateGetRequestInformation(Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); h?.Invoke(requestInfo.Headers); requestInfo.AddRequestOptions(o?.ToArray()); return requestInfo; @@ -54,8 +51,9 @@ public RequestInformation CreatePutRequestInformation(Stream body, ActionBuilds and executes requests for operations under \users\{user-id}\messages public class MessagesRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item collection public MessageRequestBuilder this[string position] { get { - return new MessageRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("message_id", position); + return new MessageRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MessagesRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessagesRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public MessagesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/messages"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } /// /// The messages in a mailbox or folder. Read-only. Nullable. @@ -45,8 +43,9 @@ public MessagesRequestBuilder(string currentPath, IRequestAdapter requestAdapter public RequestInformation CreateGetRequestInformation(Action q = default, Action> h = default, IEnumerable o = default) { var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, + UrlTemplate = UrlTemplate, + UrlTemplateParameters = UrlTemplateParameters, }; - requestInfo.SetURI(CurrentPath, PathSegment, IsRawUrl); if (q != null) { var qParams = new GetQueryParameters(); q.Invoke(qParams); @@ -66,8 +65,9 @@ public RequestInformation CreatePostRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id} public class UserRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } public InferenceClassificationRequestBuilder InferenceClassification { get => - new InferenceClassificationRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new InferenceClassificationRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } public MailFoldersRequestBuilder MailFolders { get => - new MailFoldersRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MailFoldersRequestBuilder(UrlTemplateParameters, RequestAdapter); } public MessagesRequestBuilder Messages { get => - new MessagesRequestBuilder(CurrentPath + PathSegment , RequestAdapter, false); + new MessagesRequestBuilder(UrlTemplateParameters, RequestAdapter); } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new UserRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public UserRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public UserRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = ""; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } } } diff --git a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs index d3d55b346..3862f4f7b 100644 --- a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs @@ -8,31 +8,29 @@ namespace Graphdotnetv4.Users { /// Builds and executes requests for operations under \users public class UsersRequestBuilder { - /// Current path for the request - private string CurrentPath { get; set; } - /// Whether the current path is a raw URL - private bool IsRawUrl { get; set; } - /// Path segment to use to build the URL for the current request builder - private string PathSegment { get; set; } - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } + /// Url template to use to build the URL for the current request builder + private string UrlTemplate { get; set; } + /// Url template parameters for the request + private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item collection public UserRequestBuilder this[string position] { get { - return new UserRequestBuilder(CurrentPath + PathSegment + "/" + position, RequestAdapter, false); + var urlTplParams = new Dictionary(UrlTemplateParameters); + urlTplParams.Add("user_id", position); + return new UserRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new UsersRequestBuilder and sets the default values. - /// Current path for the request - /// Whether the current path is a raw URL - /// The http core service to use to execute the requests. + /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public UsersRequestBuilder(string currentPath, IRequestAdapter requestAdapter, bool isRawUrl = true) { - if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); + public UsersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathSegment = "/users"; + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users"; RequestAdapter = requestAdapter; - CurrentPath = currentPath; - IsRawUrl = isRawUrl; + UrlTemplateParameters = urlTemplateParameters; } } } From fa42a78dcd668d4ee2c24d3577c3b9504f643437 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Oct 2021 11:22:41 -0400 Subject: [PATCH 04/14] - code-gen: raw url support in dotnet --- .../InferenceClassificationRequestBuilder.cs | 17 ++++++++++++++++- ...renceClassificationOverrideRequestBuilder.cs | 17 ++++++++++++++++- .../Overrides/OverridesRequestBuilder.cs | 17 ++++++++++++++++- .../ChildFolders/ChildFoldersRequestBuilder.cs | 17 ++++++++++++++++- .../Item/MailFolderRequestBuilder.cs | 17 ++++++++++++++++- .../Item/MailFolderRequestBuilder.cs | 17 ++++++++++++++++- .../Item/MessageRuleRequestBuilder.cs | 17 ++++++++++++++++- .../MessageRules/MessageRulesRequestBuilder.cs | 17 ++++++++++++++++- .../Attachments/AttachmentsRequestBuilder.cs | 17 ++++++++++++++++- .../Item/AttachmentRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Extensions/ExtensionsRequestBuilder.cs | 17 ++++++++++++++++- .../Extensions/Item/ExtensionRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Messages/Item/MessageRequestBuilder.cs | 17 ++++++++++++++++- ...ValueLegacyExtendedPropertyRequestBuilder.cs | 17 ++++++++++++++++- ...ultiValueExtendedPropertiesRequestBuilder.cs | 17 ++++++++++++++++- ...ValueLegacyExtendedPropertyRequestBuilder.cs | 17 ++++++++++++++++- ...ngleValueExtendedPropertiesRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Value/ContentRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Messages/MessagesRequestBuilder.cs | 17 ++++++++++++++++- ...ValueLegacyExtendedPropertyRequestBuilder.cs | 17 ++++++++++++++++- ...ultiValueExtendedPropertiesRequestBuilder.cs | 17 ++++++++++++++++- ...ValueLegacyExtendedPropertyRequestBuilder.cs | 17 ++++++++++++++++- ...ngleValueExtendedPropertiesRequestBuilder.cs | 17 ++++++++++++++++- .../MailFolders/MailFoldersRequestBuilder.cs | 17 ++++++++++++++++- .../Attachments/AttachmentsRequestBuilder.cs | 17 ++++++++++++++++- .../Item/AttachmentRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Extensions/ExtensionsRequestBuilder.cs | 17 ++++++++++++++++- .../Extensions/Item/ExtensionRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Messages/Item/MessageRequestBuilder.cs | 17 ++++++++++++++++- ...ValueLegacyExtendedPropertyRequestBuilder.cs | 17 ++++++++++++++++- ...ultiValueExtendedPropertiesRequestBuilder.cs | 17 ++++++++++++++++- ...ValueLegacyExtendedPropertyRequestBuilder.cs | 17 ++++++++++++++++- ...ngleValueExtendedPropertiesRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Value/ContentRequestBuilder.cs | 17 ++++++++++++++++- .../Item/Messages/MessagesRequestBuilder.cs | 17 ++++++++++++++++- .../dotnet/Users/Item/UserRequestBuilder.cs | 17 ++++++++++++++++- .../dotnet/Users/UsersRequestBuilder.cs | 17 ++++++++++++++++- 37 files changed, 592 insertions(+), 37 deletions(-) diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs index e9410473f..11d5c56d6 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs @@ -28,8 +28,23 @@ public InferenceClassificationRequestBuilder(Dictionary urlTempl _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new InferenceClassificationRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public InferenceClassificationRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs index 25d0edd48..f19692e1f 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs @@ -24,8 +24,23 @@ public InferenceClassificationOverrideRequestBuilder(Dictionary _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public InferenceClassificationOverrideRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs index 20b849029..fae80de7c 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs @@ -31,8 +31,23 @@ public OverridesRequestBuilder(Dictionary urlTemplateParameters, _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new OverridesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public OverridesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs index 5531280e0..b4c11fbe9 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs @@ -24,6 +24,20 @@ public MailFolderRequestBuilder this[string position] { get { } } /// /// Instantiates a new ChildFoldersRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ChildFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ChildFoldersRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -31,8 +45,9 @@ public ChildFoldersRequestBuilder(Dictionary urlTemplateParamete _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of child folders in the mailFolder. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs index 21b3c12c5..60fac53c0 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs @@ -24,8 +24,23 @@ public MailFolderRequestBuilder(Dictionary urlTemplateParameters _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MailFolderRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of child folders in the mailFolder. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs index fd1ae3845..b23c2ccb6 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs @@ -37,6 +37,20 @@ public class MailFolderRequestBuilder { private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MailFolderRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -44,8 +58,9 @@ public MailFolderRequestBuilder(Dictionary urlTemplateParameters _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The user's mail folders. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs index 26e5bb151..1713da772 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs @@ -24,8 +24,23 @@ public MessageRuleRequestBuilder(Dictionary urlTemplateParameter _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MessageRuleRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MessageRuleRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of rules that apply to the user's Inbox folder. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs index d3ecf6315..207ddbf76 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs @@ -31,8 +31,23 @@ public MessageRulesRequestBuilder(Dictionary urlTemplateParamete _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MessageRulesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MessageRulesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of rules that apply to the user's Inbox folder. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs index da0b1e42b..bd6a148a7 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs @@ -31,8 +31,23 @@ public AttachmentsRequestBuilder(Dictionary urlTemplateParameter _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new AttachmentsRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public AttachmentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs index 8ded1b37c..a6fc94275 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs @@ -24,8 +24,23 @@ public AttachmentRequestBuilder(Dictionary urlTemplateParameters _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new AttachmentRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public AttachmentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index 0431acbb5..df50d789b 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -31,8 +31,23 @@ public ExtensionsRequestBuilder(Dictionary urlTemplateParameters _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ExtensionsRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ExtensionsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs index 741219b87..a15463dbd 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs @@ -24,8 +24,23 @@ public ExtensionRequestBuilder(Dictionary urlTemplateParameters, _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ExtensionRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ExtensionRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs index 6b3c11fc1..fbb415f08 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs @@ -37,6 +37,20 @@ public class MessageRequestBuilder { private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MessageRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -44,8 +58,9 @@ public MessageRequestBuilder(Dictionary urlTemplateParameters, I _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of messages in the mailFolder. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs index 04124459f..1ead571b8 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs @@ -24,8 +24,23 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index cda7f62d2..e7b7cf8df 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -24,6 +24,20 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -31,8 +45,9 @@ public MultiValueExtendedPropertiesRequestBuilder(Dictionary url _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 87017286b..241d2ee9b 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -24,8 +24,23 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 62c416d1d..b5cf2894f 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -31,8 +31,23 @@ public SingleValueExtendedPropertiesRequestBuilder(Dictionary ur _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs index 8e75e5571..1a4acb8fe 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -23,8 +23,23 @@ public ContentRequestBuilder(Dictionary urlTemplateParameters, I _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ContentRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ContentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// Get media content for the navigation property messages from users diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs index 19e89584f..11b77f561 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs @@ -31,8 +31,23 @@ public MessagesRequestBuilder(Dictionary urlTemplateParameters, _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MessagesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MessagesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of messages in the mailFolder. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs index 4b071f49e..9591b8d52 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs @@ -24,8 +24,23 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 0c0de068f..032e0a3f1 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -24,6 +24,20 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -31,8 +45,9 @@ public MultiValueExtendedPropertiesRequestBuilder(Dictionary url _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index ebd1eb231..9e9bf75e6 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -24,8 +24,23 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index fd3d43826..eb978bc97 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -31,8 +31,23 @@ public SingleValueExtendedPropertiesRequestBuilder(Dictionary ur _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs index 91b76fab7..7ad42b373 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs @@ -24,6 +24,20 @@ public MailFolderRequestBuilder this[string position] { get { } } /// /// Instantiates a new MailFoldersRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MailFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MailFoldersRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -31,8 +45,9 @@ public MailFoldersRequestBuilder(Dictionary urlTemplateParameter _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The user's mail folders. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs index 35f96ed81..01588fac4 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs @@ -31,8 +31,23 @@ public AttachmentsRequestBuilder(Dictionary urlTemplateParameter _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new AttachmentsRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public AttachmentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs index 8a571c596..b794c2bb9 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs @@ -24,8 +24,23 @@ public AttachmentRequestBuilder(Dictionary urlTemplateParameters _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new AttachmentRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public AttachmentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The fileAttachment and itemAttachment attachments for the message. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index e6f57124e..d8e634bc2 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -31,8 +31,23 @@ public ExtensionsRequestBuilder(Dictionary urlTemplateParameters _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ExtensionsRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ExtensionsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs index abb7b98fb..ed2e11280 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs @@ -24,8 +24,23 @@ public ExtensionRequestBuilder(Dictionary urlTemplateParameters, _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ExtensionRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ExtensionRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of open extensions defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs index 87a196bd9..83a00f465 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs @@ -37,6 +37,20 @@ public class MessageRequestBuilder { private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MessageRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -44,8 +58,9 @@ public MessageRequestBuilder(Dictionary urlTemplateParameters, I _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The messages in a mailbox or folder. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs index 29976fd52..62f3c5295 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs @@ -24,8 +24,23 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 4d3585234..0d0f6f4ed 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -24,6 +24,20 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. /// The request adapter to use to execute the requests. /// Url template parameters for the request /// @@ -31,8 +45,9 @@ public MultiValueExtendedPropertiesRequestBuilder(Dictionary url _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of multi-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 3988f3d7f..7c627bd88 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -24,8 +24,23 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index d53315f08..10e6e6cf6 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -31,8 +31,23 @@ public SingleValueExtendedPropertiesRequestBuilder(Dictionary ur _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The collection of single-value extended properties defined for the message. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs index 0dea9f8cd..e786724d6 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -23,8 +23,23 @@ public ContentRequestBuilder(Dictionary urlTemplateParameters, I _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new ContentRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public ContentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// Get media content for the navigation property messages from users diff --git a/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs index 7f5bc21f4..67cfde192 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs @@ -31,8 +31,23 @@ public MessagesRequestBuilder(Dictionary urlTemplateParameters, _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new MessagesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public MessagesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } /// /// The messages in a mailbox or folder. Read-only. Nullable. diff --git a/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs index 35ba86f54..a640c46f7 100644 --- a/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs @@ -34,8 +34,23 @@ public UserRequestBuilder(Dictionary urlTemplateParameters, IReq _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new UserRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public UserRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } } } diff --git a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs index 3862f4f7b..91acbe83e 100644 --- a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs @@ -29,8 +29,23 @@ public UsersRequestBuilder(Dictionary urlTemplateParameters, IRe _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users"; + var urlTplParams = new Dictionary(urlTemplateParameters); + UrlTemplateParameters = urlTplParams; + RequestAdapter = requestAdapter; + } + /// + /// Instantiates a new UsersRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + /// + public UsersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + UrlTemplate = "https://graph.microsoft.com/v1.0/users"; + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); + UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; - UrlTemplateParameters = urlTemplateParameters; } } } From ab52d73572f31ff840353ee6f495d087714a5760 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Oct 2021 15:00:29 -0400 Subject: [PATCH 05/14] - code-gen : java url template support --- .../java/graphjavav4/utilities/ApiClient.java | 20 +++-- .../utilities/users/UsersRequestBuilder.java | 42 +++++----- .../users/item/UserRequestBuilder.java | 56 +++++++------ ...InferenceClassificationRequestBuilder.java | 55 +++++++------ .../overrides/OverridesRequestBuilder.java | 46 ++++++----- ...eClassificationOverrideRequestBuilder.java | 49 ++++++------ .../MailFoldersRequestBuilder.java | 46 ++++++----- .../item/MailFolderRequestBuilder.java | 79 +++++++++++-------- .../ChildFoldersRequestBuilder.java | 46 ++++++----- .../item/MailFolderRequestBuilder.java | 49 ++++++------ .../MessageRulesRequestBuilder.java | 46 ++++++----- .../item/MessageRuleRequestBuilder.java | 49 ++++++------ .../item/messages/MessagesRequestBuilder.java | 46 ++++++----- .../messages/item/MessageRequestBuilder.java | 75 ++++++++++-------- .../AttachmentsRequestBuilder.java | 46 ++++++----- .../item/AttachmentRequestBuilder.java | 49 ++++++------ .../extensions/ExtensionsRequestBuilder.java | 46 ++++++----- .../item/ExtensionRequestBuilder.java | 49 ++++++------ ...ValueExtendedPropertiesRequestBuilder.java | 46 ++++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 49 ++++++------ ...ValueExtendedPropertiesRequestBuilder.java | 46 ++++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 49 ++++++------ .../item/value/ContentRequestBuilder.java | 46 ++++++----- ...ValueExtendedPropertiesRequestBuilder.java | 46 ++++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 49 ++++++------ ...ValueExtendedPropertiesRequestBuilder.java | 46 ++++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 49 ++++++------ .../item/messages/MessagesRequestBuilder.java | 46 ++++++----- .../messages/item/MessageRequestBuilder.java | 75 ++++++++++-------- .../AttachmentsRequestBuilder.java | 46 ++++++----- .../item/AttachmentRequestBuilder.java | 49 ++++++------ .../extensions/ExtensionsRequestBuilder.java | 46 ++++++----- .../item/ExtensionRequestBuilder.java | 49 ++++++------ ...ValueExtendedPropertiesRequestBuilder.java | 46 ++++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 49 ++++++------ ...ValueExtendedPropertiesRequestBuilder.java | 46 ++++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 49 ++++++------ .../item/value/ContentRequestBuilder.java | 46 ++++++----- 38 files changed, 1033 insertions(+), 834 deletions(-) diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java index 7bca63e8e..9d5269659 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java @@ -8,25 +8,29 @@ import com.microsoft.kiota.serialization.SerializationWriterFactoryRegistry; import graphjavav4.utilities.users.item.UserRequestBuilder; import graphjavav4.utilities.users.UsersRequestBuilder; +import java.util.HashMap; import java.util.Objects; /** The main entry point of the SDK, exposes the configuration and the fluent API. */ public class ApiClient { - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; @javax.annotation.Nonnull public UsersRequestBuilder users() { - return new UsersRequestBuilder(pathSegment, requestAdapter, false); + return new UsersRequestBuilder(urlTemplateParameters, requestAdapter); } /** * Instantiates a new ApiClient and sets the default values. - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ public ApiClient(@javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "https://graph.microsoft.com/v1.0"; + this.urlTemplate = "https://graph.microsoft.com/v1.0"; + this.urlTemplateParameters = new HashMap<>(); this.requestAdapter = requestAdapter; ApiClientBuilder.registerDefaultSerializer(JsonSerializationWriterFactory.class); ApiClientBuilder.registerDefaultDeserializer(JsonParseNodeFactory.class); @@ -39,6 +43,8 @@ public ApiClient(@javax.annotation.Nonnull final RequestAdapter requestAdapter) @javax.annotation.Nonnull public UserRequestBuilder users(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new UserRequestBuilder(pathSegment + "/users/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("user_id", id); + return new UserRequestBuilder(urlTplParams, requestAdapter); } } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java index d9dacf2d8..7f8b075f5 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java @@ -1,39 +1,41 @@ package graphjavav4.utilities.users; import com.microsoft.kiota.RequestAdapter; +import java.util.HashMap; import java.util.Objects; /** Builds and executes requests for operations under /users */ public class UsersRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new UsersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public UsersRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new UsersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public UsersRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); - Objects.requireNonNull(requestAdapter); - this.pathSegment = "/users"; + public UsersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java index 08fe8e385..883bf0d9f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java @@ -6,52 +6,54 @@ import graphjavav4.utilities.users.item.mailFolders.MailFoldersRequestBuilder; import graphjavav4.utilities.users.item.messages.item.MessageRequestBuilder; import graphjavav4.utilities.users.item.messages.MessagesRequestBuilder; +import java.util.HashMap; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id} */ public class UserRequestBuilder { - /** Current path for the request */ - private final String currentPath; @javax.annotation.Nonnull public InferenceClassificationRequestBuilder inferenceClassification() { - return new InferenceClassificationRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new InferenceClassificationRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; @javax.annotation.Nonnull public MailFoldersRequestBuilder mailFolders() { - return new MailFoldersRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MailFoldersRequestBuilder(urlTemplateParameters, requestAdapter); } @javax.annotation.Nonnull public MessagesRequestBuilder messages() { - return new MessagesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MessagesRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new UserRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public UserRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public UserRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new UserRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public UserRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); - Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + public UserRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item collection @@ -61,7 +63,9 @@ public UserRequestBuilder(@javax.annotation.Nonnull final String currentPath, @j @javax.annotation.Nonnull public MailFolderRequestBuilder mailFolders(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MailFolderRequestBuilder(currentPath + pathSegment + "/mailFolders/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("mailFolder_id", id); + return new MailFolderRequestBuilder(urlTplParams, requestAdapter); } /** * Gets an item from the graphjavav4.utilities.users.item.messages.item collection @@ -71,6 +75,8 @@ public MailFolderRequestBuilder mailFolders(@javax.annotation.Nonnull final Stri @javax.annotation.Nonnull public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MessageRequestBuilder(currentPath + pathSegment + "/messages/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("message_id", id); + return new MessageRequestBuilder(urlTplParams, requestAdapter); } } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java index df3bda55b..8de1ef2c6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java @@ -12,45 +12,47 @@ import graphjavav4.utilities.users.item.inferenceClassification.overrides.OverridesRequestBuilder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification */ public class InferenceClassificationRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; @javax.annotation.Nonnull public OverridesRequestBuilder overrides() { - return new OverridesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new OverridesRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public InferenceClassificationRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/inferenceClassification"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. @@ -78,9 +80,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,9 +129,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -172,9 +176,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final InferenceClassification body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -316,7 +321,9 @@ public java.util.concurrent.CompletableFuture get(@java @javax.annotation.Nonnull public InferenceClassificationOverrideRequestBuilder overrides(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new InferenceClassificationOverrideRequestBuilder(currentPath + pathSegment + "/overrides/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("inferenceClassificationOverride_id", id); + return new InferenceClassificationOverrideRequestBuilder(urlTplParams, requestAdapter); } /** * Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java index 3e8b3b8e8..c0c6fb666 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.InferenceClassificationOverride; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ public class OverridesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new OverridesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public OverridesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public OverridesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new OverridesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public OverridesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/overrides"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final InferenceClassificationOverride body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java index 0f60e946c..28bd552f3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.InferenceClassificationOverride; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ public class InferenceClassificationOverrideRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public InferenceClassificationOverrideRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final InferenceClassificationOverride body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java index 9a8bcfd84..3dd416983 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MailFolder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ public class MailFoldersRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MailFoldersRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MailFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFoldersRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/mailFolders"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The user's mail folders. Read-only. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final MailFolder body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java index 33416b540..ac8adaf47 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java @@ -19,38 +19,37 @@ import graphjavav4.utilities.users.item.mailFolders.item.singleValueExtendedProperties.SingleValueExtendedPropertiesRequestBuilder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id} */ public class MailFolderRequestBuilder { @javax.annotation.Nonnull public ChildFoldersRequestBuilder childFolders() { - return new ChildFoldersRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new ChildFoldersRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; @javax.annotation.Nonnull public MessageRulesRequestBuilder messageRules() { - return new MessageRulesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MessageRulesRequestBuilder(urlTemplateParameters, requestAdapter); } @javax.annotation.Nonnull public MessagesRequestBuilder messages() { - return new MessagesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MessagesRequestBuilder(urlTemplateParameters, requestAdapter); } @javax.annotation.Nonnull public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() { - return new MultiValueExtendedPropertiesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MultiValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties() { - return new SingleValueExtendedPropertiesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new SingleValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); } + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item.childFolders.item collection * @param id Unique identifier of the item @@ -59,31 +58,36 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public MailFolderRequestBuilder childFolders(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MailFolderRequestBuilder(currentPath + pathSegment + "/childFolders/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("mailFolder_id1", id); + return new MailFolderRequestBuilder(urlTplParams, requestAdapter); } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MailFolderRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The user's mail folders. Read-only. Nullable. @@ -111,9 +115,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -159,9 +164,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -205,9 +211,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final MailFolder body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -349,7 +356,9 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation. @javax.annotation.Nonnull public MessageRuleRequestBuilder messageRules(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MessageRuleRequestBuilder(currentPath + pathSegment + "/messageRules/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("messageRule_id", id); + return new MessageRuleRequestBuilder(urlTplParams, requestAdapter); } /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item.messages.item collection @@ -359,7 +368,9 @@ public MessageRuleRequestBuilder messageRules(@javax.annotation.Nonnull final St @javax.annotation.Nonnull public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MessageRequestBuilder(currentPath + pathSegment + "/messages/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("message_id", id); + return new MessageRequestBuilder(urlTplParams, requestAdapter); } /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item.multiValueExtendedProperties.item collection @@ -369,7 +380,9 @@ public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MultiValueLegacyExtendedPropertyRequestBuilder(currentPath + pathSegment + "/multiValueExtendedProperties/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("multiValueLegacyExtendedProperty_id", id); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } /** * The user's mail folders. Read-only. Nullable. @@ -438,7 +451,9 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new SingleValueLegacyExtendedPropertyRequestBuilder(currentPath + pathSegment + "/singleValueExtendedProperties/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("singleValueLegacyExtendedProperty_id", id); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } /** The user's mail folders. Read-only. Nullable. */ public class GetQueryParameters extends QueryParametersBase { diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java index f19528576..4c09b781d 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MailFolder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ public class ChildFoldersRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ChildFoldersRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/childFolders"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of child folders in the mailFolder. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final MailFolder body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java index 50f81a1f0..405eba722 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MailFolder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ public class MailFolderRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MailFolderRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of child folders in the mailFolder. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final MailFolder body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java index cff19a2fc..bf5b384c8 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MessageRule; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ public class MessageRulesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRulesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MessageRulesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRulesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/messageRules"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of rules that apply to the user's Inbox folder. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final MessageRule body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java index 852ec1d73..1c4d760b3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MessageRule; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ public class MessageRuleRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRuleRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MessageRuleRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRuleRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of rules that apply to the user's Inbox folder. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final MessageRule body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java index 52f7b01d5..1b1a81769 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Message; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ public class MessagesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessagesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/messages"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of messages in the mailFolder. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final Message body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java index 7ef732fc9..5703909ab 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java @@ -19,38 +19,37 @@ import graphjavav4.utilities.users.item.mailFolders.item.messages.item.value.ContentRequestBuilder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id} */ public class MessageRequestBuilder { @javax.annotation.Nonnull public AttachmentsRequestBuilder attachments() { - return new AttachmentsRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new AttachmentsRequestBuilder(urlTemplateParameters, requestAdapter); } @javax.annotation.Nonnull public ContentRequestBuilder content() { - return new ContentRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new ContentRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Current path for the request */ - private final String currentPath; @javax.annotation.Nonnull public ExtensionsRequestBuilder extensions() { - return new ExtensionsRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new ExtensionsRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; @javax.annotation.Nonnull public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() { - return new MultiValueExtendedPropertiesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MultiValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties() { - return new SingleValueExtendedPropertiesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new SingleValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); } + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item.messages.item.attachments.item collection * @param id Unique identifier of the item @@ -59,31 +58,36 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new AttachmentRequestBuilder(currentPath + pathSegment + "/attachments/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("attachment_id", id); + return new AttachmentRequestBuilder(urlTplParams, requestAdapter); } /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of messages in the mailFolder. @@ -111,9 +115,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -159,9 +164,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -205,9 +211,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final Message body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -279,7 +286,9 @@ public java.util.concurrent.CompletableFuture delete(@javax.annotation.Nul @javax.annotation.Nonnull public ExtensionRequestBuilder extensions(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new ExtensionRequestBuilder(currentPath + pathSegment + "/extensions/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("extension_id", id); + return new ExtensionRequestBuilder(urlTplParams, requestAdapter); } /** * The collection of messages in the mailFolder. @@ -359,7 +368,9 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation.Nul @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MultiValueLegacyExtendedPropertyRequestBuilder(currentPath + pathSegment + "/multiValueExtendedProperties/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("multiValueLegacyExtendedProperty_id", id); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } /** * The collection of messages in the mailFolder. @@ -428,7 +439,9 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new SingleValueLegacyExtendedPropertyRequestBuilder(currentPath + pathSegment + "/singleValueExtendedProperties/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("singleValueLegacyExtendedProperty_id", id); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } /** The collection of messages in the mailFolder. */ public class GetQueryParameters extends QueryParametersBase { diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java index 034c6f3ee..b53df07c6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Attachment; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ public class AttachmentsRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentsRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/attachments"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The fileAttachment and itemAttachment attachments for the message. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final Attachment body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java index c2dc7ffed..dcb95a268 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Attachment; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ public class AttachmentRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The fileAttachment and itemAttachment attachments for the message. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final Attachment body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java index 3d3101780..8dfb412ef 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Extension; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ public class ExtensionsRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionsRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/extensions"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of open extensions defined for the message. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final Extension body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java index c56c2395e..49a4d7e9f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Extension; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ public class ExtensionRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of open extensions defined for the message. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final Extension body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index 3f4ffc018..1609d962b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MultiValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/multiValueExtendedProperties"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final MultiValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 8b0415b86..573983679 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MultiValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final MultiValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 5a6d6efbe..332100c2e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.SingleValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/singleValueExtendedProperties"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of single-value extended properties defined for the message. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final SingleValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index adef88e46..21fb04c81 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.SingleValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of single-value extended properties defined for the message. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final SingleValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java index 60709443d..3e2dfee1a 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java @@ -9,41 +9,43 @@ import java.io.InputStream; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ public class ContentRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ContentRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/$value"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * Get media content for the navigation property messages from users @@ -71,9 +73,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -112,9 +115,10 @@ public RequestInformation createPutRequestInformation(final InputStream body, @j public RequestInformation createPutRequestInformation(final InputStream body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PUT; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setStreamContent(body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index ea60b7137..e386dd361 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MultiValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/multiValueExtendedProperties"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final MultiValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 564d16a9f..d37fb7ab3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MultiValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final MultiValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 8efe2c716..55f8cba74 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.SingleValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/singleValueExtendedProperties"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final SingleValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index 4bc8a9745..d6fc98cbe 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.SingleValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final SingleValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java index 808c2979e..d9ee23176 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Message; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages */ public class MessagesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessagesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/messages"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final Message body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java index b7d3b1dbc..720e691f6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java @@ -19,38 +19,37 @@ import graphjavav4.utilities.users.item.messages.item.value.ContentRequestBuilder; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id} */ public class MessageRequestBuilder { @javax.annotation.Nonnull public AttachmentsRequestBuilder attachments() { - return new AttachmentsRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new AttachmentsRequestBuilder(urlTemplateParameters, requestAdapter); } @javax.annotation.Nonnull public ContentRequestBuilder content() { - return new ContentRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new ContentRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Current path for the request */ - private final String currentPath; @javax.annotation.Nonnull public ExtensionsRequestBuilder extensions() { - return new ExtensionsRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new ExtensionsRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; @javax.annotation.Nonnull public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() { - return new MultiValueExtendedPropertiesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new MultiValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties() { - return new SingleValueExtendedPropertiesRequestBuilder(currentPath + pathSegment, requestAdapter, false); + return new SingleValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); } + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Gets an item from the graphjavav4.utilities.users.item.messages.item.attachments.item collection * @param id Unique identifier of the item @@ -59,31 +58,36 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new AttachmentRequestBuilder(currentPath + pathSegment + "/attachments/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("attachment_id", id); + return new AttachmentRequestBuilder(urlTplParams, requestAdapter); } /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -111,9 +115,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -159,9 +164,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -205,9 +211,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final Message body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -279,7 +286,9 @@ public java.util.concurrent.CompletableFuture delete(@javax.annotation.Nul @javax.annotation.Nonnull public ExtensionRequestBuilder extensions(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new ExtensionRequestBuilder(currentPath + pathSegment + "/extensions/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("extension_id", id); + return new ExtensionRequestBuilder(urlTplParams, requestAdapter); } /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -359,7 +368,9 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation.Nul @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new MultiValueLegacyExtendedPropertyRequestBuilder(currentPath + pathSegment + "/multiValueExtendedProperties/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("multiValueLegacyExtendedProperty_id", id); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -428,7 +439,9 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - return new SingleValueLegacyExtendedPropertyRequestBuilder(currentPath + pathSegment + "/singleValueExtendedProperties/" + id, requestAdapter, false); + var urlTplParams = new HashMap(this.urlTemplateParameters); + urlTplParams.put("singleValueLegacyExtendedProperty_id", id); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } /** The messages in a mailbox or folder. Read-only. Nullable. */ public class GetQueryParameters extends QueryParametersBase { diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java index 6de13762c..c45166189 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Attachment; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ public class AttachmentsRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentsRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/attachments"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The fileAttachment and itemAttachment attachments for the message. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final Attachment body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java index 28844519d..770763436 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Attachment; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ public class AttachmentRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The fileAttachment and itemAttachment attachments for the message. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final Attachment body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java index a0a0b60a7..65eeee51c 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Extension; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ public class ExtensionsRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionsRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/extensions"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of open extensions defined for the message. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final Extension body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java index 5cdf9dc5a..e9b70da98 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.Extension; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ public class ExtensionRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of open extensions defined for the message. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final Extension body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index 6b03fbc02..f8ac1dff0 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MultiValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/multiValueExtendedProperties"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final MultiValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index ef2d6fbb5..95eb031ba 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.MultiValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final MultiValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index a6937c436..c58c02578 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.SingleValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/singleValueExtendedProperties"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of single-value extended properties defined for the message. Nullable. @@ -83,9 +85,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -129,9 +132,10 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull final SingleValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.POST; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index 2de1e3956..881585cbf 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -10,41 +10,43 @@ import graphjavav4.utilities.models.microsoft.graph.SingleValueLegacyExtendedProperty; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = ""; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * The collection of single-value extended properties defined for the message. Nullable. @@ -72,9 +74,10 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla @javax.annotation.Nonnull public RequestInformation createDeleteRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.DELETE; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -120,9 +123,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer q, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -166,9 +170,10 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnull final SingleValueLegacyExtendedProperty body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PATCH; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java index f9694e95d..0fa4f4f6d 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java @@ -9,41 +9,43 @@ import java.io.InputStream; import java.net.URISyntaxException; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ public class ContentRequestBuilder { - /** Current path for the request */ - private final String currentPath; - /** Whether the current path is a raw URL */ - private final boolean isRawUrl; - /** Path segment to use to build the URL for the current request builder */ - private final String pathSegment; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; + /** Url template to use to build the URL for the current request builder */ + private final String urlTemplate; + /** Url template parameters for the request */ + private final HashMap urlTemplateParameters; /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param requestAdapter The http core service to use to execute the requests. + * @param rawUrl The raw URL to use for the request builder. + * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ContentRequestBuilder(final String currentPath, final RequestAdapter requestAdapter) { - this(currentPath, requestAdapter, true); + public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); + this.urlTemplateParameters = urlTplParams; + this.requestAdapter = requestAdapter; } /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final String currentPath, @javax.annotation.Nonnull final RequestAdapter requestAdapter, final boolean isRawUrl) { - Objects.requireNonNull(currentPath); + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); - this.pathSegment = "/$value"; + Objects.requireNonNull(urlTemplateParameters); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; + var urlTplParams = new HashMap(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; } /** * Get media content for the navigation property messages from users @@ -71,9 +73,10 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable @javax.annotation.Nonnull public RequestInformation createGetRequestInformation(@javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.GET; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -112,9 +115,10 @@ public RequestInformation createPutRequestInformation(final InputStream body, @j public RequestInformation createPutRequestInformation(final InputStream body, @javax.annotation.Nullable final java.util.function.Consumer> h, @javax.annotation.Nullable final Collection o) throws URISyntaxException { Objects.requireNonNull(body); final RequestInformation requestInfo = new RequestInformation() {{ - this.setUri(currentPath, pathSegment, isRawUrl); httpMethod = HttpMethod.PUT; }}; + requestInfo.urlTemplate = urlTemplate; + requestInfo.urlTemplateParameters = urlTemplateParameters; requestInfo.setStreamContent(body); if (h != null) { h.accept(requestInfo.headers); From e4e33d1589126ad527fa87c0447688b70ff6737b Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 8 Oct 2021 13:27:01 -0400 Subject: [PATCH 06/14] - code-gen: typescript url parameter support --- msgraph-mail/typescript/src/apiClient.ts | 23 +++--- .../src/models/microsoft/graph/attachment.ts | 2 +- .../microsoft/graph/dateTimeTimeZone.ts | 2 +- .../models/microsoft/graph/emailAddress.ts | 2 +- .../src/models/microsoft/graph/entity.ts | 2 +- .../src/models/microsoft/graph/extension.ts | 2 +- .../models/microsoft/graph/followupFlag.ts | 2 +- .../graph/inferenceClassification.ts | 2 +- .../graph/inferenceClassificationOverride.ts | 2 +- .../microsoft/graph/internetMessageHeader.ts | 2 +- .../src/models/microsoft/graph/itemBody.ts | 2 +- .../src/models/microsoft/graph/message.ts | 2 +- .../src/models/microsoft/graph/messageRule.ts | 2 +- .../microsoft/graph/messageRulePredicates.ts | 2 +- .../graph/multiValueLegacyExtendedProperty.ts | 2 +- .../src/models/microsoft/graph/outlookItem.ts | 2 +- .../src/models/microsoft/graph/recipient.ts | 2 +- .../singleValueLegacyExtendedProperty.ts | 2 +- .../src/models/microsoft/graph/sizeRange.ts | 2 +- .../inferenceClassificationRequestBuilder.ts | 46 +++++------ ...nceClassificationOverrideRequestBuilder.ts | 38 ++++----- .../overrides/overridesRequestBuilder.ts | 35 ++++----- .../overrides/overridesResponse.ts | 2 +- .../childFoldersRequestBuilder.ts | 35 ++++----- .../item/childFolders/childFoldersResponse.ts | 2 +- .../item/mailFolderRequestBuilder.ts | 38 ++++----- .../item/mailFolderRequestBuilder.ts | 78 +++++++++++-------- .../item/messageRuleRequestBuilder.ts | 38 ++++----- .../messageRulesRequestBuilder.ts | 35 ++++----- .../item/messageRules/messageRulesResponse.ts | 2 +- .../attachments/attachmentsRequestBuilder.ts | 35 ++++----- .../item/attachments/attachmentsResponse.ts | 2 +- .../item/attachmentRequestBuilder.ts | 38 ++++----- .../extensions/extensionsRequestBuilder.ts | 35 ++++----- .../item/extensions/extensionsResponse.ts | 2 +- .../item/extensionRequestBuilder.ts | 38 ++++----- .../messages/item/messageRequestBuilder.ts | 72 +++++++++-------- ...lueLegacyExtendedPropertyRequestBuilder.ts | 38 ++++----- ...tiValueExtendedPropertiesRequestBuilder.ts | 35 ++++----- .../multiValueExtendedPropertiesResponse.ts | 2 +- ...lueLegacyExtendedPropertyRequestBuilder.ts | 38 ++++----- ...leValueExtendedPropertiesRequestBuilder.ts | 35 ++++----- .../singleValueExtendedPropertiesResponse.ts | 2 +- .../item/value/contentRequestBuilder.ts | 35 ++++----- .../item/messages/messagesRequestBuilder.ts | 35 ++++----- .../item/messages/messagesResponse.ts | 2 +- ...lueLegacyExtendedPropertyRequestBuilder.ts | 38 ++++----- ...tiValueExtendedPropertiesRequestBuilder.ts | 35 ++++----- .../multiValueExtendedPropertiesResponse.ts | 2 +- ...lueLegacyExtendedPropertyRequestBuilder.ts | 38 ++++----- ...leValueExtendedPropertiesRequestBuilder.ts | 35 ++++----- .../singleValueExtendedPropertiesResponse.ts | 2 +- .../mailFolders/mailFoldersRequestBuilder.ts | 35 ++++----- .../item/mailFolders/mailFoldersResponse.ts | 2 +- .../attachments/attachmentsRequestBuilder.ts | 35 ++++----- .../item/attachments/attachmentsResponse.ts | 2 +- .../item/attachmentRequestBuilder.ts | 38 ++++----- .../extensions/extensionsRequestBuilder.ts | 35 ++++----- .../item/extensions/extensionsResponse.ts | 2 +- .../item/extensionRequestBuilder.ts | 38 ++++----- .../messages/item/messageRequestBuilder.ts | 72 +++++++++-------- ...lueLegacyExtendedPropertyRequestBuilder.ts | 38 ++++----- ...tiValueExtendedPropertiesRequestBuilder.ts | 35 ++++----- .../multiValueExtendedPropertiesResponse.ts | 2 +- ...lueLegacyExtendedPropertyRequestBuilder.ts | 38 ++++----- ...leValueExtendedPropertiesRequestBuilder.ts | 35 ++++----- .../singleValueExtendedPropertiesResponse.ts | 2 +- .../item/value/contentRequestBuilder.ts | 35 ++++----- .../item/messages/messagesRequestBuilder.ts | 35 ++++----- .../users/item/messages/messagesResponse.ts | 2 +- .../src/users/item/userRequestBuilder.ts | 47 +++++------ .../src/users/usersRequestBuilder.ts | 29 ++++--- 72 files changed, 786 insertions(+), 773 deletions(-) diff --git a/msgraph-mail/typescript/src/apiClient.ts b/msgraph-mail/typescript/src/apiClient.ts index 5faaba5c6..7186cb158 100644 --- a/msgraph-mail/typescript/src/apiClient.ts +++ b/msgraph-mail/typescript/src/apiClient.ts @@ -1,24 +1,27 @@ import {UserRequestBuilder} from './users/item/userRequestBuilder'; import {UsersRequestBuilder} from './users/usersRequestBuilder'; -import {RequestAdapter, registerDefaultSerializer, enableBackingStoreForSerializationWriterFactory, SerializationWriterFactoryRegistry, registerDefaultDeserializer, ParseNodeFactoryRegistry} from '@microsoft/kiota-abstractions'; +import {RequestAdapter, getUrlTemplateParameters, registerDefaultSerializer, enableBackingStoreForSerializationWriterFactory, SerializationWriterFactoryRegistry, registerDefaultDeserializer, ParseNodeFactoryRegistry} from '@microsoft/kiota-abstractions'; import {JsonParseNodeFactory, JsonSerializationWriterFactory} from '@microsoft/kiota-serialization-json'; /** The main entry point of the SDK, exposes the configuration and the fluent API. */ export class ApiClient { - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; public get users(): UsersRequestBuilder { - return new UsersRequestBuilder(this.pathSegment, this.requestAdapter, false); + return new UsersRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } /** * Instantiates a new ApiClient and sets the default values. - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. */ public constructor(requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "https://graph.microsoft.com/v1.0"; + this.urlTemplateParameters = new Map(); + this.urlTemplate = "https://graph.microsoft.com/v1.0"; this.requestAdapter = requestAdapter; registerDefaultSerializer(JsonSerializationWriterFactory); registerDefaultDeserializer(JsonParseNodeFactory); @@ -28,8 +31,10 @@ export class ApiClient { * @param id Unique identifier of the item * @returns a userRequestBuilder */ - public usersById(id: String) : UserRequestBuilder { + public usersById(id: string) : UserRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new UserRequestBuilder(this.pathSegment + "/users/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("user_id", id); + return new UserRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/attachment.ts b/msgraph-mail/typescript/src/models/microsoft/graph/attachment.ts index 1d434ecff..06642ba9c 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/attachment.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/attachment.ts @@ -1,5 +1,5 @@ import {Entity} from './entity'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class Attachment extends Entity implements Parsable { /** The MIME type. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/dateTimeTimeZone.ts b/msgraph-mail/typescript/src/models/microsoft/graph/dateTimeTimeZone.ts index d1cfa63a8..a1e7ef424 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/dateTimeTimeZone.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/dateTimeTimeZone.ts @@ -1,4 +1,4 @@ -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class DateTimeTimeZone implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/emailAddress.ts b/msgraph-mail/typescript/src/models/microsoft/graph/emailAddress.ts index 62cffe3dd..81edaafca 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/emailAddress.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/emailAddress.ts @@ -1,4 +1,4 @@ -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class EmailAddress implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/entity.ts b/msgraph-mail/typescript/src/models/microsoft/graph/entity.ts index 68fef64c3..0f16d69b8 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/entity.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/entity.ts @@ -1,4 +1,4 @@ -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class Entity implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/extension.ts b/msgraph-mail/typescript/src/models/microsoft/graph/extension.ts index ceebfddfc..2c696af3f 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/extension.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/extension.ts @@ -1,5 +1,5 @@ import {Entity} from './entity'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class Extension extends Entity implements Parsable { /** diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/followupFlag.ts b/msgraph-mail/typescript/src/models/microsoft/graph/followupFlag.ts index a44f02f67..1d4ffc110 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/followupFlag.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/followupFlag.ts @@ -1,6 +1,6 @@ import {DateTimeTimeZone} from './dateTimeTimeZone'; import {FollowupFlagStatus} from './followupFlagStatus'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class FollowupFlag implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassification.ts b/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassification.ts index 668261cbc..abc2399c0 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassification.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassification.ts @@ -1,6 +1,6 @@ import {Entity} from './entity'; import {InferenceClassificationOverride} from './inferenceClassificationOverride'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class InferenceClassification extends Entity implements Parsable { /** A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassificationOverride.ts b/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassificationOverride.ts index 541a72881..68b4a6731 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassificationOverride.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/inferenceClassificationOverride.ts @@ -1,7 +1,7 @@ import {EmailAddress} from './emailAddress'; import {Entity} from './entity'; import {InferenceClassificationType} from './inferenceClassificationType'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class InferenceClassificationOverride extends Entity implements Parsable { private _classifyAs?: InferenceClassificationType | undefined; diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/internetMessageHeader.ts b/msgraph-mail/typescript/src/models/microsoft/graph/internetMessageHeader.ts index 5d763d699..5080e10a4 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/internetMessageHeader.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/internetMessageHeader.ts @@ -1,4 +1,4 @@ -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class InternetMessageHeader implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/itemBody.ts b/msgraph-mail/typescript/src/models/microsoft/graph/itemBody.ts index 765001c88..53ab7c8c2 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/itemBody.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/itemBody.ts @@ -1,5 +1,5 @@ import {BodyType} from './bodyType'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class ItemBody implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/message.ts b/msgraph-mail/typescript/src/models/microsoft/graph/message.ts index e3175a9df..6ef3b789c 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/message.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/message.ts @@ -9,7 +9,7 @@ import {MultiValueLegacyExtendedProperty} from './multiValueLegacyExtendedProper import {OutlookItem} from './outlookItem'; import {Recipient} from './recipient'; import {SingleValueLegacyExtendedProperty} from './singleValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class Message extends OutlookItem implements Parsable { /** The fileAttachment and itemAttachment attachments for the message. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/messageRule.ts b/msgraph-mail/typescript/src/models/microsoft/graph/messageRule.ts index 1eb822c1e..951d7e10c 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/messageRule.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/messageRule.ts @@ -1,7 +1,7 @@ import {Entity} from './entity'; import {MessageRuleActions} from './messageRuleActions'; import {MessageRulePredicates} from './messageRulePredicates'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MessageRule extends Entity implements Parsable { private _actions?: MessageRuleActions | undefined; diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/messageRulePredicates.ts b/msgraph-mail/typescript/src/models/microsoft/graph/messageRulePredicates.ts index 028d7c32f..6eb9d2c95 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/messageRulePredicates.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/messageRulePredicates.ts @@ -3,7 +3,7 @@ import {MessageActionFlag} from './messageActionFlag'; import {Recipient} from './recipient'; import {Sensitivity} from './sensitivity'; import {SizeRange} from './sizeRange'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MessageRulePredicates implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/multiValueLegacyExtendedProperty.ts b/msgraph-mail/typescript/src/models/microsoft/graph/multiValueLegacyExtendedProperty.ts index b6ec27b55..608af0a71 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/multiValueLegacyExtendedProperty.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/multiValueLegacyExtendedProperty.ts @@ -1,5 +1,5 @@ import {Entity} from './entity'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MultiValueLegacyExtendedProperty extends Entity implements Parsable { /** A collection of property values. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/outlookItem.ts b/msgraph-mail/typescript/src/models/microsoft/graph/outlookItem.ts index 346330949..55e5bc1e2 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/outlookItem.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/outlookItem.ts @@ -1,5 +1,5 @@ import {Entity} from './entity'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class OutlookItem extends Entity implements Parsable { /** The categories associated with the item */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/recipient.ts b/msgraph-mail/typescript/src/models/microsoft/graph/recipient.ts index bc0e8e109..a9c6b2aff 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/recipient.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/recipient.ts @@ -1,5 +1,5 @@ import {EmailAddress} from './emailAddress'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class Recipient implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/singleValueLegacyExtendedProperty.ts b/msgraph-mail/typescript/src/models/microsoft/graph/singleValueLegacyExtendedProperty.ts index 48c4d940b..a66e235d3 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/singleValueLegacyExtendedProperty.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/singleValueLegacyExtendedProperty.ts @@ -1,5 +1,5 @@ import {Entity} from './entity'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class SingleValueLegacyExtendedProperty extends Entity implements Parsable { /** A property value. */ diff --git a/msgraph-mail/typescript/src/models/microsoft/graph/sizeRange.ts b/msgraph-mail/typescript/src/models/microsoft/graph/sizeRange.ts index f8c5acc1a..69c65c202 100644 --- a/msgraph-mail/typescript/src/models/microsoft/graph/sizeRange.ts +++ b/msgraph-mail/typescript/src/models/microsoft/graph/sizeRange.ts @@ -1,4 +1,4 @@ -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class SizeRange implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts index c21e5208e..bb7dc9acd 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts @@ -1,34 +1,31 @@ import {InferenceClassification} from '../../../models/microsoft/graph/inferenceClassification'; import {InferenceClassificationOverrideRequestBuilder} from './overrides/item/inferenceClassificationOverrideRequestBuilder'; import {OverridesRequestBuilder} from './overrides/overridesRequestBuilder'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification */ export class InferenceClassificationRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; public get overrides(): OverridesRequestBuilder { - return new OverridesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new OverridesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/inferenceClassification"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. @@ -38,7 +35,8 @@ export class InferenceClassificationRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -56,7 +54,8 @@ export class InferenceClassificationRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -73,7 +72,8 @@ export class InferenceClassificationRequestBuilder { public createPatchRequestInformation(body: InferenceClassification | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -114,9 +114,11 @@ export class InferenceClassificationRequestBuilder { * @param id Unique identifier of the item * @returns a inferenceClassificationOverrideRequestBuilder */ - public overridesById(id: String) : InferenceClassificationOverrideRequestBuilder { + public overridesById(id: string) : InferenceClassificationOverrideRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new InferenceClassificationOverrideRequestBuilder(this.currentPath + this.pathSegment + "/overrides/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("inferenceClassificationOverride_id", id); + return new InferenceClassificationOverrideRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts index bab8609e9..16e0b7599 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts @@ -1,29 +1,26 @@ import {InferenceClassificationOverride} from '../../../../../models/microsoft/graph/inferenceClassificationOverride'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ export class InferenceClassificationOverrideRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -33,7 +30,8 @@ export class InferenceClassificationOverrideRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class InferenceClassificationOverrideRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class InferenceClassificationOverrideRequestBuilder { public createPatchRequestInformation(body: InferenceClassificationOverride | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts index 262908478..a6e4a300b 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts @@ -1,30 +1,27 @@ import {InferenceClassificationOverride} from '../../../../models/microsoft/graph/inferenceClassificationOverride'; import {OverridesResponse} from './overridesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ export class OverridesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new OverridesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/overrides"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -44,7 +41,8 @@ export class OverridesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class OverridesRequestBuilder { public createPostRequestInformation(body: InferenceClassificationOverride | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesResponse.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesResponse.ts index 882aaace8..a08b3aa93 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesResponse.ts @@ -1,5 +1,5 @@ import {InferenceClassificationOverride} from '../../../../models/microsoft/graph/inferenceClassificationOverride'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class OverridesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts index 78ff5aabb..34c1a947f 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts @@ -1,30 +1,27 @@ import {MailFolder} from '../../../../../models/microsoft/graph/mailFolder'; import {ChildFoldersResponse} from './childFoldersResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ export class ChildFoldersRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/childFolders"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of child folders in the mailFolder. @@ -44,7 +41,8 @@ export class ChildFoldersRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class ChildFoldersRequestBuilder { public createPostRequestInformation(body: MailFolder | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersResponse.ts index 99c6cc5f7..e5986629e 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersResponse.ts @@ -1,5 +1,5 @@ import {MailFolder} from '../../../../../models/microsoft/graph/mailFolder'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class ChildFoldersResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts index aa9dabf54..2ed6413e3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts @@ -1,29 +1,26 @@ import {MailFolder} from '../../../../../../models/microsoft/graph/mailFolder'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ export class MailFolderRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of child folders in the mailFolder. @@ -33,7 +30,8 @@ export class MailFolderRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class MailFolderRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class MailFolderRequestBuilder { public createPatchRequestInformation(body: MailFolder | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts index 48df363e6..84dae6b14 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts @@ -9,55 +9,54 @@ import {MultiValueLegacyExtendedPropertyRequestBuilder} from './multiValueExtend import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder'; import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; -import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id} */ export class MailFolderRequestBuilder { public get childFolders(): ChildFoldersRequestBuilder { - return new ChildFoldersRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new ChildFoldersRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; public get messageRules(): MessageRulesRequestBuilder { - return new MessageRulesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MessageRulesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } public get messages(): MessagesRequestBuilder { - return new MessagesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MessagesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } public get multiValueExtendedProperties(): MultiValueExtendedPropertiesRequestBuilder { - return new MultiValueExtendedPropertiesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MultiValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { - return new SingleValueExtendedPropertiesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new SingleValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item.childFolders.item collection * @param id Unique identifier of the item * @returns a mailFolderRequestBuilder */ - public childFoldersById(id: String) : i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8 { + public childFoldersById(id: string) : i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8 { if(!id) throw new Error("id cannot be undefined"); - return new i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8(this.currentPath + this.pathSegment + "/childFolders/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("mailFolder_id1", id); + return new i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8(urlTplParams, this.requestAdapter); }; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The user's mail folders. Read-only. Nullable. @@ -67,7 +66,8 @@ export class MailFolderRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -85,7 +85,8 @@ export class MailFolderRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -102,7 +103,8 @@ export class MailFolderRequestBuilder { public createPatchRequestInformation(body: MailFolder | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -143,27 +145,33 @@ export class MailFolderRequestBuilder { * @param id Unique identifier of the item * @returns a messageRuleRequestBuilder */ - public messageRulesById(id: String) : MessageRuleRequestBuilder { + public messageRulesById(id: string) : MessageRuleRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MessageRuleRequestBuilder(this.currentPath + this.pathSegment + "/messageRules/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("messageRule_id", id); + return new MessageRuleRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item.messages.item collection * @param id Unique identifier of the item * @returns a messageRequestBuilder */ - public messagesById(id: String) : MessageRequestBuilder { + public messagesById(id: string) : MessageRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MessageRequestBuilder(this.currentPath + this.pathSegment + "/messages/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("message_id", id); + return new MessageRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item.multiValueExtendedProperties.item collection * @param id Unique identifier of the item * @returns a multiValueLegacyExtendedPropertyRequestBuilder */ - public multiValueExtendedPropertiesById(id: String) : MultiValueLegacyExtendedPropertyRequestBuilder { + public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MultiValueLegacyExtendedPropertyRequestBuilder(this.currentPath + this.pathSegment + "/multiValueExtendedProperties/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("multiValueLegacyExtendedProperty_id", id); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; /** * The user's mail folders. Read-only. Nullable. @@ -184,8 +192,10 @@ export class MailFolderRequestBuilder { * @param id Unique identifier of the item * @returns a singleValueLegacyExtendedPropertyRequestBuilder */ - public singleValueExtendedPropertiesById(id: String) : SingleValueLegacyExtendedPropertyRequestBuilder { + public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new SingleValueLegacyExtendedPropertyRequestBuilder(this.currentPath + this.pathSegment + "/singleValueExtendedProperties/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("singleValueLegacyExtendedProperty_id", id); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts index ebf21116b..2a708e904 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts @@ -1,29 +1,26 @@ import {MessageRule} from '../../../../../../models/microsoft/graph/messageRule'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ export class MessageRuleRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of rules that apply to the user's Inbox folder. @@ -33,7 +30,8 @@ export class MessageRuleRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class MessageRuleRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class MessageRuleRequestBuilder { public createPatchRequestInformation(body: MessageRule | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts index b6c756464..05b0b7912 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts @@ -1,30 +1,27 @@ import {MessageRule} from '../../../../../models/microsoft/graph/messageRule'; import {MessageRulesResponse} from './messageRulesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ export class MessageRulesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/messageRules"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of rules that apply to the user's Inbox folder. @@ -44,7 +41,8 @@ export class MessageRulesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MessageRulesRequestBuilder { public createPostRequestInformation(body: MessageRule | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesResponse.ts index 553eab4a1..f667755a2 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesResponse.ts @@ -1,5 +1,5 @@ import {MessageRule} from '../../../../../models/microsoft/graph/messageRule'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MessageRulesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts index 1ef1f3120..92e80705f 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -1,30 +1,27 @@ import {Attachment} from '../../../../../../../models/microsoft/graph/attachment'; import {AttachmentsResponse} from './attachmentsResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/attachments"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The fileAttachment and itemAttachment attachments for the message. @@ -44,7 +41,8 @@ export class AttachmentsRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class AttachmentsRequestBuilder { public createPostRequestInformation(body: Attachment | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsResponse.ts index 53e911ceb..e49aa45ac 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsResponse.ts @@ -1,5 +1,5 @@ import {Attachment} from '../../../../../../../models/microsoft/graph/attachment'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class AttachmentsResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts index d7f4ad3e0..339f790ed 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -1,29 +1,26 @@ import {Attachment} from '../../../../../../../../models/microsoft/graph/attachment'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The fileAttachment and itemAttachment attachments for the message. @@ -33,7 +30,8 @@ export class AttachmentRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class AttachmentRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class AttachmentRequestBuilder { public createPatchRequestInformation(body: Attachment | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts index 81f74ee3f..3328c7ffd 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -1,30 +1,27 @@ import {Extension} from '../../../../../../../models/microsoft/graph/extension'; import {ExtensionsResponse} from './extensionsResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/extensions"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of open extensions defined for the message. Nullable. @@ -44,7 +41,8 @@ export class ExtensionsRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class ExtensionsRequestBuilder { public createPostRequestInformation(body: Extension | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsResponse.ts index 47cd32861..42bd7ad79 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsResponse.ts @@ -1,5 +1,5 @@ import {Extension} from '../../../../../../../models/microsoft/graph/extension'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class ExtensionsResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts index e90c840e9..3c319541d 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -1,29 +1,26 @@ import {Extension} from '../../../../../../../../models/microsoft/graph/extension'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of open extensions defined for the message. Nullable. @@ -33,7 +30,8 @@ export class ExtensionRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class ExtensionRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class ExtensionRequestBuilder { public createPatchRequestInformation(body: Extension | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts index 79668d180..8f997e0d7 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts @@ -8,55 +8,54 @@ import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedPr import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; import {ContentRequestBuilder} from './value/contentRequestBuilder'; -import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id} */ export class MessageRequestBuilder { public get attachments(): AttachmentsRequestBuilder { - return new AttachmentsRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new AttachmentsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } public get content(): ContentRequestBuilder { - return new ContentRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new ContentRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Current path for the request */ - private readonly currentPath: string; public get extensions(): ExtensionsRequestBuilder { - return new ExtensionsRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new ExtensionsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; public get multiValueExtendedProperties(): MultiValueExtendedPropertiesRequestBuilder { - return new MultiValueExtendedPropertiesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MultiValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { - return new SingleValueExtendedPropertiesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new SingleValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item.messages.item.attachments.item collection * @param id Unique identifier of the item * @returns a attachmentRequestBuilder */ - public attachmentsById(id: String) : AttachmentRequestBuilder { + public attachmentsById(id: string) : AttachmentRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new AttachmentRequestBuilder(this.currentPath + this.pathSegment + "/attachments/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("attachment_id", id); + return new AttachmentRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of messages in the mailFolder. @@ -66,7 +65,8 @@ export class MessageRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -84,7 +84,8 @@ export class MessageRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -101,7 +102,8 @@ export class MessageRequestBuilder { public createPatchRequestInformation(body: Message | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -125,9 +127,11 @@ export class MessageRequestBuilder { * @param id Unique identifier of the item * @returns a extensionRequestBuilder */ - public extensionsById(id: String) : ExtensionRequestBuilder { + public extensionsById(id: string) : ExtensionRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new ExtensionRequestBuilder(this.currentPath + this.pathSegment + "/extensions/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("extension_id", id); + return new ExtensionRequestBuilder(urlTplParams, this.requestAdapter); }; /** * The collection of messages in the mailFolder. @@ -151,9 +155,11 @@ export class MessageRequestBuilder { * @param id Unique identifier of the item * @returns a multiValueLegacyExtendedPropertyRequestBuilder */ - public multiValueExtendedPropertiesById(id: String) : MultiValueLegacyExtendedPropertyRequestBuilder { + public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MultiValueLegacyExtendedPropertyRequestBuilder(this.currentPath + this.pathSegment + "/multiValueExtendedProperties/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("multiValueLegacyExtendedProperty_id", id); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; /** * The collection of messages in the mailFolder. @@ -174,8 +180,10 @@ export class MessageRequestBuilder { * @param id Unique identifier of the item * @returns a singleValueLegacyExtendedPropertyRequestBuilder */ - public singleValueExtendedPropertiesById(id: String) : SingleValueLegacyExtendedPropertyRequestBuilder { + public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new SingleValueLegacyExtendedPropertyRequestBuilder(this.currentPath + this.pathSegment + "/singleValueExtendedProperties/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("singleValueLegacyExtendedProperty_id", id); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 934ca54e4..6c4184d01 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,29 +1,26 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -33,7 +30,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { public createPatchRequestInformation(body: MultiValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index 5e43f4af5..5b3c03b3f 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,30 +1,27 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/multiValueExtendedProperties"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -44,7 +41,8 @@ export class MultiValueExtendedPropertiesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MultiValueExtendedPropertiesRequestBuilder { public createPostRequestInformation(body: MultiValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts index 605105abb..d160f23dd 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts @@ -1,5 +1,5 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MultiValueExtendedPropertiesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 9128d6da4..3a787f6c3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,29 +1,26 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of single-value extended properties defined for the message. Nullable. @@ -33,7 +30,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { public createPatchRequestInformation(body: SingleValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index adbd6f660..102c72112 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,30 +1,27 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/singleValueExtendedProperties"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of single-value extended properties defined for the message. Nullable. @@ -44,7 +41,8 @@ export class SingleValueExtendedPropertiesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class SingleValueExtendedPropertiesRequestBuilder { public createPostRequestInformation(body: SingleValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts index b9f19ccaf..875abb557 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts @@ -1,5 +1,5 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class SingleValueExtendedPropertiesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts index 4e15b80d1..357fd97b3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts @@ -1,29 +1,26 @@ -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ export class ContentRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/$value"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * Get media content for the navigation property messages from users @@ -33,7 +30,8 @@ export class ContentRequestBuilder { */ public createGetRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -49,7 +47,8 @@ export class ContentRequestBuilder { public createPutRequestInformation(body: ReadableStream, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PUT; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setStreamContent(body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts index 97124478d..1d11a05f3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts @@ -1,30 +1,27 @@ import {Message} from '../../../../../models/microsoft/graph/message'; import {MessagesResponse} from './messagesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ export class MessagesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/messages"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of messages in the mailFolder. @@ -44,7 +41,8 @@ export class MessagesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MessagesRequestBuilder { public createPostRequestInformation(body: Message | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesResponse.ts index 2f4dc6984..8592a1770 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesResponse.ts @@ -1,5 +1,5 @@ import {Message} from '../../../../../models/microsoft/graph/message'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MessagesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 4f679e87a..c86a5878c 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,29 +1,26 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -33,7 +30,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { public createPatchRequestInformation(body: MultiValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index e5386115f..dbeb2cf2f 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,30 +1,27 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/multiValueExtendedProperties"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -44,7 +41,8 @@ export class MultiValueExtendedPropertiesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MultiValueExtendedPropertiesRequestBuilder { public createPostRequestInformation(body: MultiValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts index bd8cff7f0..8f5b0323a 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts @@ -1,5 +1,5 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MultiValueExtendedPropertiesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 2e2b2fda7..61d6feb0e 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,29 +1,26 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -33,7 +30,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { public createPatchRequestInformation(body: SingleValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index a3904708f..8db22bbb3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,30 +1,27 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/singleValueExtendedProperties"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -44,7 +41,8 @@ export class SingleValueExtendedPropertiesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class SingleValueExtendedPropertiesRequestBuilder { public createPostRequestInformation(body: SingleValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts index 50df02592..80b68c5da 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts @@ -1,5 +1,5 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class SingleValueExtendedPropertiesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts index 1bcc47c53..edf5e8aba 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts @@ -1,30 +1,27 @@ import {MailFolder} from '../../../models/microsoft/graph/mailFolder'; import {MailFoldersResponse} from './mailFoldersResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ export class MailFoldersRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/mailFolders"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The user's mail folders. Read-only. Nullable. @@ -44,7 +41,8 @@ export class MailFoldersRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MailFoldersRequestBuilder { public createPostRequestInformation(body: MailFolder | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersResponse.ts b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersResponse.ts index d14d61fa1..5457c96d8 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersResponse.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersResponse.ts @@ -1,5 +1,5 @@ import {MailFolder} from '../../../models/microsoft/graph/mailFolder'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MailFoldersResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts index 2f1d96e2e..ef4de94d8 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -1,30 +1,27 @@ import {Attachment} from '../../../../../models/microsoft/graph/attachment'; import {AttachmentsResponse} from './attachmentsResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/attachments"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The fileAttachment and itemAttachment attachments for the message. @@ -44,7 +41,8 @@ export class AttachmentsRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class AttachmentsRequestBuilder { public createPostRequestInformation(body: Attachment | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsResponse.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsResponse.ts index de83d967a..76c291c2d 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsResponse.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsResponse.ts @@ -1,5 +1,5 @@ import {Attachment} from '../../../../../models/microsoft/graph/attachment'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class AttachmentsResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts index 772c04a04..e1d8913a6 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -1,29 +1,26 @@ import {Attachment} from '../../../../../../models/microsoft/graph/attachment'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The fileAttachment and itemAttachment attachments for the message. @@ -33,7 +30,8 @@ export class AttachmentRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class AttachmentRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class AttachmentRequestBuilder { public createPatchRequestInformation(body: Attachment | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts index 86bbb180d..55c0590c3 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -1,30 +1,27 @@ import {Extension} from '../../../../../models/microsoft/graph/extension'; import {ExtensionsResponse} from './extensionsResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/extensions"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of open extensions defined for the message. Nullable. @@ -44,7 +41,8 @@ export class ExtensionsRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class ExtensionsRequestBuilder { public createPostRequestInformation(body: Extension | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsResponse.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsResponse.ts index 57c4f169f..31654e4c5 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsResponse.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsResponse.ts @@ -1,5 +1,5 @@ import {Extension} from '../../../../../models/microsoft/graph/extension'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class ExtensionsResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts index a054b8e86..ee032e40c 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -1,29 +1,26 @@ import {Extension} from '../../../../../../models/microsoft/graph/extension'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of open extensions defined for the message. Nullable. @@ -33,7 +30,8 @@ export class ExtensionRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class ExtensionRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class ExtensionRequestBuilder { public createPatchRequestInformation(body: Extension | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts index 638a083cc..ffdf5814c 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts @@ -8,55 +8,54 @@ import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedPr import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; import {ContentRequestBuilder} from './value/contentRequestBuilder'; -import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id} */ export class MessageRequestBuilder { public get attachments(): AttachmentsRequestBuilder { - return new AttachmentsRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new AttachmentsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } public get content(): ContentRequestBuilder { - return new ContentRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new ContentRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Current path for the request */ - private readonly currentPath: string; public get extensions(): ExtensionsRequestBuilder { - return new ExtensionsRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new ExtensionsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; public get multiValueExtendedProperties(): MultiValueExtendedPropertiesRequestBuilder { - return new MultiValueExtendedPropertiesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MultiValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { - return new SingleValueExtendedPropertiesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new SingleValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Gets an item from the graphtypescriptv4.utilities.users.item.messages.item.attachments.item collection * @param id Unique identifier of the item * @returns a attachmentRequestBuilder */ - public attachmentsById(id: String) : AttachmentRequestBuilder { + public attachmentsById(id: string) : AttachmentRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new AttachmentRequestBuilder(this.currentPath + this.pathSegment + "/attachments/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("attachment_id", id); + return new AttachmentRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -66,7 +65,8 @@ export class MessageRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -84,7 +84,8 @@ export class MessageRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -101,7 +102,8 @@ export class MessageRequestBuilder { public createPatchRequestInformation(body: Message | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -125,9 +127,11 @@ export class MessageRequestBuilder { * @param id Unique identifier of the item * @returns a extensionRequestBuilder */ - public extensionsById(id: String) : ExtensionRequestBuilder { + public extensionsById(id: string) : ExtensionRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new ExtensionRequestBuilder(this.currentPath + this.pathSegment + "/extensions/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("extension_id", id); + return new ExtensionRequestBuilder(urlTplParams, this.requestAdapter); }; /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -151,9 +155,11 @@ export class MessageRequestBuilder { * @param id Unique identifier of the item * @returns a multiValueLegacyExtendedPropertyRequestBuilder */ - public multiValueExtendedPropertiesById(id: String) : MultiValueLegacyExtendedPropertyRequestBuilder { + public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MultiValueLegacyExtendedPropertyRequestBuilder(this.currentPath + this.pathSegment + "/multiValueExtendedProperties/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("multiValueLegacyExtendedProperty_id", id); + return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -174,8 +180,10 @@ export class MessageRequestBuilder { * @param id Unique identifier of the item * @returns a singleValueLegacyExtendedPropertyRequestBuilder */ - public singleValueExtendedPropertiesById(id: String) : SingleValueLegacyExtendedPropertyRequestBuilder { + public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new SingleValueLegacyExtendedPropertyRequestBuilder(this.currentPath + this.pathSegment + "/singleValueExtendedProperties/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("singleValueLegacyExtendedProperty_id", id); + return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 7c08443e0..0b8d4c451 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,29 +1,26 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -33,7 +30,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { public createPatchRequestInformation(body: MultiValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index dfade73e5..ce7e8ec86 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,30 +1,27 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/multiValueExtendedProperties"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of multi-value extended properties defined for the message. Nullable. @@ -44,7 +41,8 @@ export class MultiValueExtendedPropertiesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MultiValueExtendedPropertiesRequestBuilder { public createPostRequestInformation(body: MultiValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts index bd8cff7f0..8f5b0323a 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesResponse.ts @@ -1,5 +1,5 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MultiValueExtendedPropertiesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 9f1ca1eec..f0bd559f2 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,29 +1,26 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of single-value extended properties defined for the message. Nullable. @@ -33,7 +30,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { */ public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -51,7 +49,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { select?: string[] } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +67,8 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { public createPatchRequestInformation(body: SingleValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 9b048b858..4b834fa30 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,30 +1,27 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/singleValueExtendedProperties"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The collection of single-value extended properties defined for the message. Nullable. @@ -44,7 +41,8 @@ export class SingleValueExtendedPropertiesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class SingleValueExtendedPropertiesRequestBuilder { public createPostRequestInformation(body: SingleValueLegacyExtendedProperty | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts index 50df02592..80b68c5da 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesResponse.ts @@ -1,5 +1,5 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class SingleValueExtendedPropertiesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts index 9853b4511..97c8e366d 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts @@ -1,29 +1,26 @@ -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ export class ContentRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/$value"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * Get media content for the navigation property messages from users @@ -33,7 +30,8 @@ export class ContentRequestBuilder { */ public createGetRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -49,7 +47,8 @@ export class ContentRequestBuilder { public createPutRequestInformation(body: ReadableStream, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.PUT; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setStreamContent(body); diff --git a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts index ab2090551..54c08daf5 100644 --- a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts @@ -1,30 +1,27 @@ import {Message} from '../../../models/microsoft/graph/message'; import {MessagesResponse} from './messagesResponse'; -import {HttpMethod, RequestInformation, RequestOption, RequestAdapter, ResponseHandler, Parsable} from '@microsoft/kiota-abstractions'; +import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages */ export class MessagesRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/messages"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * The messages in a mailbox or folder. Read-only. Nullable. @@ -44,7 +41,8 @@ export class MessagesRequestBuilder { top?: number } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -61,7 +59,8 @@ export class MessagesRequestBuilder { public createPostRequestInformation(body: Message | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); - requestInfo.setUri(this.currentPath, this.pathSegment, this.isRawUrl); + requestInfo.urlTemplate = this.urlTemplate; + requestInfo.urlTemplateParameters = this.urlTemplateParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/messagesResponse.ts b/msgraph-mail/typescript/src/users/item/messages/messagesResponse.ts index f1fe4a332..e767bea24 100644 --- a/msgraph-mail/typescript/src/users/item/messages/messagesResponse.ts +++ b/msgraph-mail/typescript/src/users/item/messages/messagesResponse.ts @@ -1,5 +1,5 @@ import {Message} from '../../../models/microsoft/graph/message'; -import {Parsable, SerializationWriter, ParseNode} from '@microsoft/kiota-abstractions'; +import {Parsable, ParseNode, SerializationWriter} from '@microsoft/kiota-abstractions'; export class MessagesResponse implements Parsable { /** Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well. */ diff --git a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts index 6236e2b62..65b2f6e9f 100644 --- a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts @@ -3,57 +3,58 @@ import {MailFolderRequestBuilder} from './mailFolders/item/mailFolderRequestBuil import {MailFoldersRequestBuilder} from './mailFolders/mailFoldersRequestBuilder'; import {MessageRequestBuilder} from './messages/item/messageRequestBuilder'; import {MessagesRequestBuilder} from './messages/messagesRequestBuilder'; -import {RequestAdapter} from '@microsoft/kiota-abstractions'; +import {RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id} */ export class UserRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; public get inferenceClassification(): InferenceClassificationRequestBuilder { - return new InferenceClassificationRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new InferenceClassificationRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; public get mailFolders(): MailFoldersRequestBuilder { - return new MailFoldersRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MailFoldersRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } public get messages(): MessagesRequestBuilder { - return new MessagesRequestBuilder(this.currentPath + this.pathSegment, this.requestAdapter, false); + return new MessagesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); } - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new UserRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = ""; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item collection * @param id Unique identifier of the item * @returns a mailFolderRequestBuilder */ - public mailFoldersById(id: String) : MailFolderRequestBuilder { + public mailFoldersById(id: string) : MailFolderRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MailFolderRequestBuilder(this.currentPath + this.pathSegment + "/mailFolders/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("mailFolder_id", id); + return new MailFolderRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Gets an item from the graphtypescriptv4.utilities.users.item.messages.item collection * @param id Unique identifier of the item * @returns a messageRequestBuilder */ - public messagesById(id: String) : MessageRequestBuilder { + public messagesById(id: string) : MessageRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - return new MessageRequestBuilder(this.currentPath + this.pathSegment + "/messages/" + id, this.requestAdapter, false); + const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + urlTplParams.set("message_id", id); + return new MessageRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts index 76183c953..c375c4fbf 100644 --- a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts @@ -1,27 +1,24 @@ -import {RequestAdapter} from '@microsoft/kiota-abstractions'; +import {RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users */ export class UsersRequestBuilder { - /** Current path for the request */ - private readonly currentPath: string; - /** Whether the current path is a raw URL */ - private readonly isRawUrl: boolean; - /** Path segment to use to build the URL for the current request builder */ - private readonly pathSegment: string; - /** The http core service to use to execute the requests. */ + /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; + /** Url template to use to build the URL for the current request builder */ + private readonly urlTemplate: string; + /** Url template parameters for the request */ + private readonly urlTemplateParameters: Map; /** * Instantiates a new UsersRequestBuilder and sets the default values. - * @param currentPath Current path for the request - * @param isRawUrl Whether the current path is a raw URL - * @param requestAdapter The http core service to use to execute the requests. + * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(currentPath: string, requestAdapter: RequestAdapter, isRawUrl: boolean = true) { - if(!currentPath) throw new Error("currentPath cannot be undefined"); + public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathSegment = "/users"; + if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); + this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; + const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); + this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; - this.currentPath = currentPath; - this.isRawUrl = isRawUrl; }; } From bbf68661df083e9acac2ab3029a6864ea15b967d Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 12 Oct 2021 12:49:55 -0400 Subject: [PATCH 07/14] - code-gen: go url template support --- msgraph-mail/go/utilities/api_client.go | 17 ++- msgraph-mail/go/utilities/go.sum | 2 + ...nference_classification_request_builder.go | 70 ++++++------ ...classification_override_request_builder.go | 61 +++++----- .../overrides/overrides_request_builder.go | 49 ++++---- .../child_folders_request_builder.go | 49 ++++---- .../item/mail_folder_request_builder.go | 61 +++++----- .../item/mail_folder_request_builder.go | 106 +++++++++++------- .../item/message_rule_request_builder.go | 61 +++++----- .../message_rules_request_builder.go | 49 ++++---- .../attachments_request_builder.go | 49 ++++---- .../item/attachment_request_builder.go | 61 +++++----- .../extensions/extensions_request_builder.go | 49 ++++---- .../item/extension_request_builder.go | 61 +++++----- .../messages/item/message_request_builder.go | 99 +++++++++------- ...egacy_extended_property_request_builder.go | 61 +++++----- ...lue_extended_properties_request_builder.go | 49 ++++---- ...egacy_extended_property_request_builder.go | 61 +++++----- ...lue_extended_properties_request_builder.go | 49 ++++---- .../item/value/content_request_builder.go | 45 ++++---- .../item/messages/messages_request_builder.go | 49 ++++---- ...egacy_extended_property_request_builder.go | 61 +++++----- ...lue_extended_properties_request_builder.go | 49 ++++---- ...egacy_extended_property_request_builder.go | 61 +++++----- ...lue_extended_properties_request_builder.go | 49 ++++---- .../mail_folders_request_builder.go | 49 ++++---- .../attachments_request_builder.go | 49 ++++---- .../item/attachment_request_builder.go | 61 +++++----- .../extensions/extensions_request_builder.go | 49 ++++---- .../item/extension_request_builder.go | 61 +++++----- .../messages/item/message_request_builder.go | 99 +++++++++------- ...egacy_extended_property_request_builder.go | 61 +++++----- ...lue_extended_properties_request_builder.go | 49 ++++---- ...egacy_extended_property_request_builder.go | 61 +++++----- ...lue_extended_properties_request_builder.go | 49 ++++---- .../item/value/content_request_builder.go | 45 ++++---- .../item/messages/messages_request_builder.go | 49 ++++---- .../users/item/user_request_builder.go | 41 +++++-- .../utilities/users/users_request_builder.go | 21 ++-- 39 files changed, 1148 insertions(+), 974 deletions(-) diff --git a/msgraph-mail/go/utilities/api_client.go b/msgraph-mail/go/utilities/api_client.go index 808c6ac5f..52702221a 100644 --- a/msgraph-mail/go/utilities/api_client.go +++ b/msgraph-mail/go/utilities/api_client.go @@ -7,21 +7,28 @@ import ( ) type ApiClient struct { - pathSegment string - requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter + requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter + urlTemplate string + urlTemplateParameters map[string]string } func NewApiClient(requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter) *ApiClient { m := &ApiClient{} - m.pathSegment = "https://graph.microsoft.com/v1.0" + m.urlTemplate = "https://graph.microsoft.com/v1.0" + m.urlTemplateParameters = make(map[string]string) m.requestAdapter = requestAdapter // ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RegisterDefaultSerializer(func() i04eb5309aeaafadd28374d79c8471df9b267510b4dc2e3144c378c50f6fd7b55.SerializationWriterFactory { return id1ae20a9e00c372d14381acc2299aa946a25894316974139983388e4b11bb84b.NewJsonSerializationWriterFactory() }) // ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RegisterDefaultDeserializer(func() i04eb5309aeaafadd28374d79c8471df9b267510b4dc2e3144c378c50f6fd7b55.ParseNodeFactory { return id1ae20a9e00c372d14381acc2299aa946a25894316974139983388e4b11bb84b.NewJsonParseNodeFactory() }) return m } func (m *ApiClient) Users() ie51e765764484004639cdfca9cb330e622fbf042d77be5ba8e7a002ffc8f8ed7.UsersRequestBuilder { - return *ie51e765764484004639cdfca9cb330e622fbf042d77be5ba8e7a002ffc8f8ed7.NewUsersRequestBuilder(m.pathSegment, m.requestAdapter, false) + return *ie51e765764484004639cdfca9cb330e622fbf042d77be5ba8e7a002ffc8f8ed7.NewUsersRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter) } func (m *ApiClient) UsersById(id string) i993da4875956788f567345c5c97cefaefa8f33555fde8bb29d1fd49e374ccccd.UserRequestBuilder { - return *i993da4875956788f567345c5c97cefaefa8f33555fde8bb29d1fd49e374ccccd.NewUserRequestBuilder(m.pathSegment+"/users/"+id, m.requestAdapter, false) + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["user_id"] = id + return *i993da4875956788f567345c5c97cefaefa8f33555fde8bb29d1fd49e374ccccd.NewUserRequestBuilderInternal(urlTplParams, m.requestAdapter) } diff --git a/msgraph-mail/go/utilities/go.sum b/msgraph-mail/go/utilities/go.sum index 3dfe1c9f2..cc0001fb7 100644 --- a/msgraph-mail/go/utilities/go.sum +++ b/msgraph-mail/go/utilities/go.sum @@ -1,2 +1,4 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/yosida95/uritemplate/v3 v3.0.1 h1:+Fs//CsT+x231WmUQhMHWMxZizMvpnkOVWop02mVCfs= +github.com/yosida95/uritemplate/v3 v3.0.1/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4= diff --git a/msgraph-mail/go/utilities/users/item/inferenceclassification/inference_classification_request_builder.go b/msgraph-mail/go/utilities/users/item/inferenceclassification/inference_classification_request_builder.go index 5d339ffe2..c0d4be3f0 100644 --- a/msgraph-mail/go/utilities/users/item/inferenceclassification/inference_classification_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/inferenceclassification/inference_classification_request_builder.go @@ -9,99 +9,100 @@ import ( ) type InferenceClassificationRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type InferenceClassificationRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewInferenceClassificationRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*InferenceClassificationRequestBuilder) { +func NewInferenceClassificationRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationRequestBuilder) { m := &InferenceClassificationRequestBuilder{ } - m.pathSegment = "/inferenceClassification"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewInferenceClassificationRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewInferenceClassificationRequestBuilderInternal(urlParams, requestAdapter) +} func (m *InferenceClassificationRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *InferenceClassificationRequestBuilder) CreateGetRequestInformation(q func (value *InferenceClassificationRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(InferenceClassificationRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *InferenceClassificationRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassification, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *InferenceClassificationRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); @@ -130,10 +131,15 @@ func (m *InferenceClassificationRequestBuilder) Get(q func (value *InferenceClas } } func (m *InferenceClassificationRequestBuilder) Overrides()(i3b892eb54cedbd9cc555b9f1a7958d6152b7730fa895edaed6eaa7e22b3c15ca.OverridesRequestBuilder) { - return *i3b892eb54cedbd9cc555b9f1a7958d6152b7730fa895edaed6eaa7e22b3c15ca.NewOverridesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i3b892eb54cedbd9cc555b9f1a7958d6152b7730fa895edaed6eaa7e22b3c15ca.NewOverridesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *InferenceClassificationRequestBuilder) OverridesById(id string)(ie9af6222ea455c01969cfed303f450bfed10eddca9c64da588590323f4684264.InferenceClassificationOverrideRequestBuilder) { - return *ie9af6222ea455c01969cfed303f450bfed10eddca9c64da588590323f4684264.NewInferenceClassificationOverrideRequestBuilder(m.currentPath + m.pathSegment + "/overrides/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["inferenceClassificationOverride_id"] = id + return *ie9af6222ea455c01969cfed303f450bfed10eddca9c64da588590323f4684264.NewInferenceClassificationOverrideRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *InferenceClassificationRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassification, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreatePatchRequestInformation(body, h, o); diff --git a/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/item/inference_classification_override_request_builder.go b/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/item/inference_classification_override_request_builder.go index c5bf9dd58..06cebcf15 100644 --- a/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/item/inference_classification_override_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/item/inference_classification_override_request_builder.go @@ -7,99 +7,100 @@ import ( ) type InferenceClassificationOverrideRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type InferenceClassificationOverrideRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewInferenceClassificationOverrideRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*InferenceClassificationOverrideRequestBuilder) { +func NewInferenceClassificationOverrideRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationOverrideRequestBuilder) { m := &InferenceClassificationOverrideRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewInferenceClassificationOverrideRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationOverrideRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewInferenceClassificationOverrideRequestBuilderInternal(urlParams, requestAdapter) +} func (m *InferenceClassificationOverrideRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *InferenceClassificationOverrideRequestBuilder) CreateGetRequestInformation(q func (value *InferenceClassificationOverrideRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(InferenceClassificationOverrideRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *InferenceClassificationOverrideRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassificationOverride, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *InferenceClassificationOverrideRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/overrides_request_builder.go b/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/overrides_request_builder.go index 2cb6086a0..6cd645dd1 100644 --- a/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/overrides_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/inferenceclassification/overrides/overrides_request_builder.go @@ -7,10 +7,9 @@ import ( ) type OverridesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type OverridesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type OverridesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewOverridesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*OverridesRequestBuilder) { +func NewOverridesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*OverridesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewOverridesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewOverridesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*OverridesRequestBuilder) { m := &OverridesRequestBuilder{ } - m.pathSegment = "/overrides"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *OverridesRequestBuilder) CreateGetRequestInformation(q func (value *OverridesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(OverridesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *OverridesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassificationOverride, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *OverridesRequestBuilder) Get(q func (value *OverridesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*OverridesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/child_folders_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/child_folders_request_builder.go index 5aa047096..647e359a5 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/child_folders_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/child_folders_request_builder.go @@ -7,10 +7,9 @@ import ( ) type ChildFoldersRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type ChildFoldersRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type ChildFoldersRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewChildFoldersRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ChildFoldersRequestBuilder) { +func NewChildFoldersRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ChildFoldersRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewChildFoldersRequestBuilderInternal(urlParams, requestAdapter) +} +func NewChildFoldersRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ChildFoldersRequestBuilder) { m := &ChildFoldersRequestBuilder{ } - m.pathSegment = "/childFolders"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *ChildFoldersRequestBuilder) CreateGetRequestInformation(q func (value *ChildFoldersRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(ChildFoldersRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ChildFoldersRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MailFolder, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ChildFoldersRequestBuilder) Get(q func (value *ChildFoldersRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*ChildFoldersResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/item/mail_folder_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/item/mail_folder_request_builder.go index fe9a10756..aac8dbe3a 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/item/mail_folder_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/childfolders/item/mail_folder_request_builder.go @@ -7,99 +7,100 @@ import ( ) type MailFolderRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MailFolderRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewMailFolderRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MailFolderRequestBuilder) { +func NewMailFolderRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MailFolderRequestBuilder) { m := &MailFolderRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMailFolderRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MailFolderRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMailFolderRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MailFolderRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFolderRequestBuilder) CreateGetRequestInformation(q func (value *MailFolderRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MailFolderRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFolderRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MailFolder, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFolderRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/mail_folder_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/mail_folder_request_builder.go index dd01425e3..afe367b90 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/mail_folder_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/mail_folder_request_builder.go @@ -17,10 +17,9 @@ import ( ) type MailFolderRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MailFolderRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -28,94 +27,101 @@ type MailFolderRequestBuilderGetQueryParameters struct { Select_escpaped []string; } func (m *MailFolderRequestBuilder) ChildFolders()(i25eccaab35ae736780065dc9a8dc7482fdcb0caedd552ebe3bc32819574bdd1c.ChildFoldersRequestBuilder) { - return *i25eccaab35ae736780065dc9a8dc7482fdcb0caedd552ebe3bc32819574bdd1c.NewChildFoldersRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i25eccaab35ae736780065dc9a8dc7482fdcb0caedd552ebe3bc32819574bdd1c.NewChildFoldersRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MailFolderRequestBuilder) ChildFoldersById(id string)(i181e312a167613000dccbb9ebecd1868a9fa4f41ee5a7ecb670740df9765d172.MailFolderRequestBuilder) { - return *i181e312a167613000dccbb9ebecd1868a9fa4f41ee5a7ecb670740df9765d172.NewMailFolderRequestBuilder(m.currentPath + m.pathSegment + "/childFolders/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["mailFolder_id1"] = id + return *i181e312a167613000dccbb9ebecd1868a9fa4f41ee5a7ecb670740df9765d172.NewMailFolderRequestBuilderInternal(urlTplParams, m.requestAdapter); } -func NewMailFolderRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MailFolderRequestBuilder) { +func NewMailFolderRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MailFolderRequestBuilder) { m := &MailFolderRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMailFolderRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MailFolderRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMailFolderRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MailFolderRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFolderRequestBuilder) CreateGetRequestInformation(q func (value *MailFolderRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MailFolderRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFolderRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MailFolder, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFolderRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); @@ -144,22 +150,37 @@ func (m *MailFolderRequestBuilder) Get(q func (value *MailFolderRequestBuilderGe } } func (m *MailFolderRequestBuilder) MessageRules()(i8292dd9b1a0fee9945f96685dd56cd53e49fea510defe9e9be5f718692b7780b.MessageRulesRequestBuilder) { - return *i8292dd9b1a0fee9945f96685dd56cd53e49fea510defe9e9be5f718692b7780b.NewMessageRulesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i8292dd9b1a0fee9945f96685dd56cd53e49fea510defe9e9be5f718692b7780b.NewMessageRulesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MailFolderRequestBuilder) MessageRulesById(id string)(i0fbca58a8d08af34163fee8e520aa4597b6c44f81ff3cfb5f35e29bcdca13621.MessageRuleRequestBuilder) { - return *i0fbca58a8d08af34163fee8e520aa4597b6c44f81ff3cfb5f35e29bcdca13621.NewMessageRuleRequestBuilder(m.currentPath + m.pathSegment + "/messageRules/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["messageRule_id"] = id + return *i0fbca58a8d08af34163fee8e520aa4597b6c44f81ff3cfb5f35e29bcdca13621.NewMessageRuleRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MailFolderRequestBuilder) Messages()(ifde4ccdcab963c649b4bf69fc48707d15a301d0c5085720fb9c273d0b6fdab37.MessagesRequestBuilder) { - return *ifde4ccdcab963c649b4bf69fc48707d15a301d0c5085720fb9c273d0b6fdab37.NewMessagesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *ifde4ccdcab963c649b4bf69fc48707d15a301d0c5085720fb9c273d0b6fdab37.NewMessagesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MailFolderRequestBuilder) MessagesById(id string)(id9e66f56b6b4a00e301a4a3f0507d126e9c676567ee5351fbae1f29bdf7542a1.MessageRequestBuilder) { - return *id9e66f56b6b4a00e301a4a3f0507d126e9c676567ee5351fbae1f29bdf7542a1.NewMessageRequestBuilder(m.currentPath + m.pathSegment + "/messages/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["message_id"] = id + return *id9e66f56b6b4a00e301a4a3f0507d126e9c676567ee5351fbae1f29bdf7542a1.NewMessageRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MailFolderRequestBuilder) MultiValueExtendedProperties()(i9edbc9e69c9374a312359d6ba60470f270b3741c34a0b8bf1d40a0b0997e5c7b.MultiValueExtendedPropertiesRequestBuilder) { - return *i9edbc9e69c9374a312359d6ba60470f270b3741c34a0b8bf1d40a0b0997e5c7b.NewMultiValueExtendedPropertiesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i9edbc9e69c9374a312359d6ba60470f270b3741c34a0b8bf1d40a0b0997e5c7b.NewMultiValueExtendedPropertiesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MailFolderRequestBuilder) MultiValueExtendedPropertiesById(id string)(i33ecd413f6751e2cbf414d6016f0af76590db7141528c4aac7ee62c4cb3c4bcc.MultiValueLegacyExtendedPropertyRequestBuilder) { - return *i33ecd413f6751e2cbf414d6016f0af76590db7141528c4aac7ee62c4cb3c4bcc.NewMultiValueLegacyExtendedPropertyRequestBuilder(m.currentPath + m.pathSegment + "/multiValueExtendedProperties/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["multiValueLegacyExtendedProperty_id"] = id + return *i33ecd413f6751e2cbf414d6016f0af76590db7141528c4aac7ee62c4cb3c4bcc.NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MailFolderRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MailFolder, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreatePatchRequestInformation(body, h, o); @@ -175,8 +196,13 @@ func (m *MailFolderRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba } } func (m *MailFolderRequestBuilder) SingleValueExtendedProperties()(i813340affbf9a598103dd11e02bd85608be12b91284a30d07f60a1aac1a263e6.SingleValueExtendedPropertiesRequestBuilder) { - return *i813340affbf9a598103dd11e02bd85608be12b91284a30d07f60a1aac1a263e6.NewSingleValueExtendedPropertiesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i813340affbf9a598103dd11e02bd85608be12b91284a30d07f60a1aac1a263e6.NewSingleValueExtendedPropertiesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MailFolderRequestBuilder) SingleValueExtendedPropertiesById(id string)(idbb7dc5e3b94a6671fc2fde24821fbe6f90b0bfdd4d8781f45540e2e3d778e66.SingleValueLegacyExtendedPropertyRequestBuilder) { - return *idbb7dc5e3b94a6671fc2fde24821fbe6f90b0bfdd4d8781f45540e2e3d778e66.NewSingleValueLegacyExtendedPropertyRequestBuilder(m.currentPath + m.pathSegment + "/singleValueExtendedProperties/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["singleValueLegacyExtendedProperty_id"] = id + return *idbb7dc5e3b94a6671fc2fde24821fbe6f90b0bfdd4d8781f45540e2e3d778e66.NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlTplParams, m.requestAdapter); } diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/item/message_rule_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/item/message_rule_request_builder.go index 6e592e71e..9c636ef9e 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/item/message_rule_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/item/message_rule_request_builder.go @@ -7,99 +7,100 @@ import ( ) type MessageRuleRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MessageRuleRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewMessageRuleRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MessageRuleRequestBuilder) { +func NewMessageRuleRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRuleRequestBuilder) { m := &MessageRuleRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMessageRuleRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRuleRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMessageRuleRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MessageRuleRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRuleRequestBuilder) CreateGetRequestInformation(q func (value *MessageRuleRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MessageRuleRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRuleRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MessageRule, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRuleRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/message_rules_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/message_rules_request_builder.go index 34700d49b..049bbe932 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/message_rules_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messagerules/message_rules_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MessageRulesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MessageRulesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MessageRulesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMessageRulesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MessageRulesRequestBuilder) { +func NewMessageRulesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRulesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMessageRulesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMessageRulesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRulesRequestBuilder) { m := &MessageRulesRequestBuilder{ } - m.pathSegment = "/messageRules"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MessageRulesRequestBuilder) CreateGetRequestInformation(q func (value *MessageRulesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MessageRulesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRulesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MessageRule, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRulesRequestBuilder) Get(q func (value *MessageRulesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MessageRulesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/attachments_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/attachments_request_builder.go index 2d57058ac..17e40ffd1 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/attachments_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/attachments_request_builder.go @@ -7,10 +7,9 @@ import ( ) type AttachmentsRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type AttachmentsRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type AttachmentsRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewAttachmentsRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*AttachmentsRequestBuilder) { +func NewAttachmentsRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentsRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewAttachmentsRequestBuilderInternal(urlParams, requestAdapter) +} +func NewAttachmentsRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentsRequestBuilder) { m := &AttachmentsRequestBuilder{ } - m.pathSegment = "/attachments"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *AttachmentsRequestBuilder) CreateGetRequestInformation(q func (value *AttachmentsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(AttachmentsRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentsRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Attachment, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentsRequestBuilder) Get(q func (value *AttachmentsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*AttachmentsResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/item/attachment_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/item/attachment_request_builder.go index 14808cc29..124d2370c 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/item/attachment_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/attachments/item/attachment_request_builder.go @@ -7,99 +7,100 @@ import ( ) type AttachmentRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type AttachmentRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewAttachmentRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*AttachmentRequestBuilder) { +func NewAttachmentRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentRequestBuilder) { m := &AttachmentRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewAttachmentRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewAttachmentRequestBuilderInternal(urlParams, requestAdapter) +} func (m *AttachmentRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentRequestBuilder) CreateGetRequestInformation(q func (value *AttachmentRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(AttachmentRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Attachment, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/extensions_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/extensions_request_builder.go index bc5a589cd..fa6a45ed3 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/extensions_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/extensions_request_builder.go @@ -7,10 +7,9 @@ import ( ) type ExtensionsRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type ExtensionsRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type ExtensionsRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewExtensionsRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ExtensionsRequestBuilder) { +func NewExtensionsRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionsRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewExtensionsRequestBuilderInternal(urlParams, requestAdapter) +} +func NewExtensionsRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionsRequestBuilder) { m := &ExtensionsRequestBuilder{ } - m.pathSegment = "/extensions"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *ExtensionsRequestBuilder) CreateGetRequestInformation(q func (value *ExtensionsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(ExtensionsRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionsRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Extension, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionsRequestBuilder) Get(q func (value *ExtensionsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*ExtensionsResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/item/extension_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/item/extension_request_builder.go index ad86e7397..148648020 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/item/extension_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/extensions/item/extension_request_builder.go @@ -7,99 +7,100 @@ import ( ) type ExtensionRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type ExtensionRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewExtensionRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ExtensionRequestBuilder) { +func NewExtensionRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionRequestBuilder) { m := &ExtensionRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewExtensionRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewExtensionRequestBuilderInternal(urlParams, requestAdapter) +} func (m *ExtensionRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionRequestBuilder) CreateGetRequestInformation(q func (value *ExtensionRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(ExtensionRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Extension, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/message_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/message_request_builder.go index af97d99ce..d9a9daad5 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/message_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/message_request_builder.go @@ -16,10 +16,9 @@ import ( ) type MessageRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MessageRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -27,97 +26,104 @@ type MessageRequestBuilderGetQueryParameters struct { Select_escpaped []string; } func (m *MessageRequestBuilder) Attachments()(i9b8e8e1d8c7f8c0fa45b5abe65e2541be081536bd338e75409f4b0ecba2188aa.AttachmentsRequestBuilder) { - return *i9b8e8e1d8c7f8c0fa45b5abe65e2541be081536bd338e75409f4b0ecba2188aa.NewAttachmentsRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i9b8e8e1d8c7f8c0fa45b5abe65e2541be081536bd338e75409f4b0ecba2188aa.NewAttachmentsRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) AttachmentsById(id string)(i92b891944e73393404194faa96a7587068f07492bd44347d827c18456b8a2bcf.AttachmentRequestBuilder) { - return *i92b891944e73393404194faa96a7587068f07492bd44347d827c18456b8a2bcf.NewAttachmentRequestBuilder(m.currentPath + m.pathSegment + "/attachments/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["attachment_id"] = id + return *i92b891944e73393404194faa96a7587068f07492bd44347d827c18456b8a2bcf.NewAttachmentRequestBuilderInternal(urlTplParams, m.requestAdapter); } -func NewMessageRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MessageRequestBuilder) { +func NewMessageRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRequestBuilder) { m := &MessageRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMessageRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMessageRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MessageRequestBuilder) Content()(i000de88af33510156072c580aff36ddc934a6dbf385120aee0662cecf92dfee6.ContentRequestBuilder) { - return *i000de88af33510156072c580aff36ddc934a6dbf385120aee0662cecf92dfee6.NewContentRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i000de88af33510156072c580aff36ddc934a6dbf385120aee0662cecf92dfee6.NewContentRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRequestBuilder) CreateGetRequestInformation(q func (value *MessageRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MessageRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); @@ -133,10 +139,15 @@ func (m *MessageRequestBuilder) Delete(h func (value map[string]string) (err err } } func (m *MessageRequestBuilder) Extensions()(i281b692d3f673c995c16b5cc69287c818497fc74562aed972acc168040629f74.ExtensionsRequestBuilder) { - return *i281b692d3f673c995c16b5cc69287c818497fc74562aed972acc168040629f74.NewExtensionsRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i281b692d3f673c995c16b5cc69287c818497fc74562aed972acc168040629f74.NewExtensionsRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) ExtensionsById(id string)(icb423aed2922bb0caf9a0353a5ec5bfeb474588dbd1218008894e86ab49c6e25.ExtensionRequestBuilder) { - return *icb423aed2922bb0caf9a0353a5ec5bfeb474588dbd1218008894e86ab49c6e25.NewExtensionRequestBuilder(m.currentPath + m.pathSegment + "/extensions/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["extension_id"] = id + return *icb423aed2922bb0caf9a0353a5ec5bfeb474588dbd1218008894e86ab49c6e25.NewExtensionRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MessageRequestBuilder) Get(q func (value *MessageRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); @@ -152,10 +163,15 @@ func (m *MessageRequestBuilder) Get(q func (value *MessageRequestBuilderGetQuery } } func (m *MessageRequestBuilder) MultiValueExtendedProperties()(i165e60b62d06f92d5e6029daee4ae129b1c3d1780dce2631cc18fbe8c6d39c9d.MultiValueExtendedPropertiesRequestBuilder) { - return *i165e60b62d06f92d5e6029daee4ae129b1c3d1780dce2631cc18fbe8c6d39c9d.NewMultiValueExtendedPropertiesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i165e60b62d06f92d5e6029daee4ae129b1c3d1780dce2631cc18fbe8c6d39c9d.NewMultiValueExtendedPropertiesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) MultiValueExtendedPropertiesById(id string)(i314a2a68928bac08cd3678f4259eab0e5845a67017fe63526811793a0c7a4615.MultiValueLegacyExtendedPropertyRequestBuilder) { - return *i314a2a68928bac08cd3678f4259eab0e5845a67017fe63526811793a0c7a4615.NewMultiValueLegacyExtendedPropertyRequestBuilder(m.currentPath + m.pathSegment + "/multiValueExtendedProperties/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["multiValueLegacyExtendedProperty_id"] = id + return *i314a2a68928bac08cd3678f4259eab0e5845a67017fe63526811793a0c7a4615.NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MessageRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreatePatchRequestInformation(body, h, o); @@ -171,8 +187,13 @@ func (m *MessageRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8 } } func (m *MessageRequestBuilder) SingleValueExtendedProperties()(i833cf7d5250828d0b2288e87035b59c2900b4aef7c2eb2ff5494a38edea8268e.SingleValueExtendedPropertiesRequestBuilder) { - return *i833cf7d5250828d0b2288e87035b59c2900b4aef7c2eb2ff5494a38edea8268e.NewSingleValueExtendedPropertiesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i833cf7d5250828d0b2288e87035b59c2900b4aef7c2eb2ff5494a38edea8268e.NewSingleValueExtendedPropertiesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) SingleValueExtendedPropertiesById(id string)(ia3b46812df8e43b8356e8bad54f90359cc966c930f9415ac7f61670490ce857f.SingleValueLegacyExtendedPropertyRequestBuilder) { - return *ia3b46812df8e43b8356e8bad54f90359cc966c930f9415ac7f61670490ce857f.NewSingleValueLegacyExtendedPropertyRequestBuilder(m.currentPath + m.pathSegment + "/singleValueExtendedProperties/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["singleValueLegacyExtendedProperty_id"] = id + return *ia3b46812df8e43b8356e8bad54f90359cc966c930f9415ac7f61670490ce857f.NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlTplParams, m.requestAdapter); } diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go index c45e5299c..cc6ccb166 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go @@ -7,99 +7,100 @@ import ( ) type MultiValueLegacyExtendedPropertyRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewMultiValueLegacyExtendedPropertyRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MultiValueLegacyExtendedPropertyRequestBuilder) { +func NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueLegacyExtendedPropertyRequestBuilder) { m := &MultiValueLegacyExtendedPropertyRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMultiValueLegacyExtendedPropertyRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueLegacyExtendedPropertyRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreateGetRequestInformation(q func (value *MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MultiValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go index a04bf4f25..1f4477a00 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MultiValueExtendedPropertiesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MultiValueExtendedPropertiesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MultiValueExtendedPropertiesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMultiValueExtendedPropertiesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MultiValueExtendedPropertiesRequestBuilder) { +func NewMultiValueExtendedPropertiesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueExtendedPropertiesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMultiValueExtendedPropertiesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMultiValueExtendedPropertiesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueExtendedPropertiesRequestBuilder) { m := &MultiValueExtendedPropertiesRequestBuilder{ } - m.pathSegment = "/multiValueExtendedProperties"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MultiValueExtendedPropertiesRequestBuilder) CreateGetRequestInformation(q func (value *MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueExtendedPropertiesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MultiValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueExtendedPropertiesRequestBuilder) Get(q func (value *MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MultiValueExtendedPropertiesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go index 0bc5e839d..29181405d 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go @@ -7,99 +7,100 @@ import ( ) type SingleValueLegacyExtendedPropertyRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewSingleValueLegacyExtendedPropertyRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*SingleValueLegacyExtendedPropertyRequestBuilder) { +func NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueLegacyExtendedPropertyRequestBuilder) { m := &SingleValueLegacyExtendedPropertyRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewSingleValueLegacyExtendedPropertyRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueLegacyExtendedPropertyRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlParams, requestAdapter) +} func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreateGetRequestInformation(q func (value *SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.SingleValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go index 7cc7879de..bd3ecc15d 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go @@ -7,10 +7,9 @@ import ( ) type SingleValueExtendedPropertiesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type SingleValueExtendedPropertiesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type SingleValueExtendedPropertiesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewSingleValueExtendedPropertiesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*SingleValueExtendedPropertiesRequestBuilder) { +func NewSingleValueExtendedPropertiesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueExtendedPropertiesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewSingleValueExtendedPropertiesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewSingleValueExtendedPropertiesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueExtendedPropertiesRequestBuilder) { m := &SingleValueExtendedPropertiesRequestBuilder{ } - m.pathSegment = "/singleValueExtendedProperties"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *SingleValueExtendedPropertiesRequestBuilder) CreateGetRequestInformation(q func (value *SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueExtendedPropertiesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.SingleValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueExtendedPropertiesRequestBuilder) Get(q func (value *SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*SingleValueExtendedPropertiesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/value/content_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/value/content_request_builder.go index 3552e2ae0..eea0a8961 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/value/content_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/item/value/content_request_builder.go @@ -5,62 +5,65 @@ import ( ) type ContentRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } -func NewContentRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ContentRequestBuilder) { +func NewContentRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ContentRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewContentRequestBuilderInternal(urlParams, requestAdapter) +} +func NewContentRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ContentRequestBuilder) { m := &ContentRequestBuilder{ } - m.pathSegment = "/$value"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *ContentRequestBuilder) CreateGetRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ContentRequestBuilder) CreatePutRequestInformation(body []byte, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PUT - if err != nil { - return nil, err - } requestInfo.SetStreamContent(body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ContentRequestBuilder) Get(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() ([]byte, error)) { requestInfo, err := m.CreateGetRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/messages_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/messages_request_builder.go index 6982880c2..efd04a499 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/messages_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/messages/messages_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MessagesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MessagesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MessagesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMessagesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MessagesRequestBuilder) { +func NewMessagesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessagesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMessagesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMessagesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessagesRequestBuilder) { m := &MessagesRequestBuilder{ } - m.pathSegment = "/messages"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MessagesRequestBuilder) CreateGetRequestInformation(q func (value *MessagesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MessagesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessagesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessagesRequestBuilder) Get(q func (value *MessagesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MessagesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go index c45e5299c..945dfd351 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go @@ -7,99 +7,100 @@ import ( ) type MultiValueLegacyExtendedPropertyRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewMultiValueLegacyExtendedPropertyRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MultiValueLegacyExtendedPropertyRequestBuilder) { +func NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueLegacyExtendedPropertyRequestBuilder) { m := &MultiValueLegacyExtendedPropertyRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMultiValueLegacyExtendedPropertyRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueLegacyExtendedPropertyRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreateGetRequestInformation(q func (value *MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MultiValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go index a04bf4f25..31e30916d 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MultiValueExtendedPropertiesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MultiValueExtendedPropertiesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MultiValueExtendedPropertiesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMultiValueExtendedPropertiesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MultiValueExtendedPropertiesRequestBuilder) { +func NewMultiValueExtendedPropertiesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueExtendedPropertiesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMultiValueExtendedPropertiesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMultiValueExtendedPropertiesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueExtendedPropertiesRequestBuilder) { m := &MultiValueExtendedPropertiesRequestBuilder{ } - m.pathSegment = "/multiValueExtendedProperties"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MultiValueExtendedPropertiesRequestBuilder) CreateGetRequestInformation(q func (value *MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueExtendedPropertiesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MultiValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueExtendedPropertiesRequestBuilder) Get(q func (value *MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MultiValueExtendedPropertiesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go index 0bc5e839d..5e98a3ab3 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go @@ -7,99 +7,100 @@ import ( ) type SingleValueLegacyExtendedPropertyRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewSingleValueLegacyExtendedPropertyRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*SingleValueLegacyExtendedPropertyRequestBuilder) { +func NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueLegacyExtendedPropertyRequestBuilder) { m := &SingleValueLegacyExtendedPropertyRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewSingleValueLegacyExtendedPropertyRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueLegacyExtendedPropertyRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlParams, requestAdapter) +} func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreateGetRequestInformation(q func (value *SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.SingleValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go index 7cc7879de..3f3bdae9a 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go @@ -7,10 +7,9 @@ import ( ) type SingleValueExtendedPropertiesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type SingleValueExtendedPropertiesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type SingleValueExtendedPropertiesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewSingleValueExtendedPropertiesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*SingleValueExtendedPropertiesRequestBuilder) { +func NewSingleValueExtendedPropertiesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueExtendedPropertiesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewSingleValueExtendedPropertiesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewSingleValueExtendedPropertiesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueExtendedPropertiesRequestBuilder) { m := &SingleValueExtendedPropertiesRequestBuilder{ } - m.pathSegment = "/singleValueExtendedProperties"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *SingleValueExtendedPropertiesRequestBuilder) CreateGetRequestInformation(q func (value *SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueExtendedPropertiesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.SingleValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueExtendedPropertiesRequestBuilder) Get(q func (value *SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*SingleValueExtendedPropertiesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/mailfolders/mail_folders_request_builder.go b/msgraph-mail/go/utilities/users/item/mailfolders/mail_folders_request_builder.go index 402a6eb60..b8cb851db 100644 --- a/msgraph-mail/go/utilities/users/item/mailfolders/mail_folders_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/mailfolders/mail_folders_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MailFoldersRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MailFoldersRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MailFoldersRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMailFoldersRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MailFoldersRequestBuilder) { +func NewMailFoldersRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MailFoldersRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMailFoldersRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMailFoldersRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MailFoldersRequestBuilder) { m := &MailFoldersRequestBuilder{ } - m.pathSegment = "/mailFolders"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MailFoldersRequestBuilder) CreateGetRequestInformation(q func (value *MailFoldersRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MailFoldersRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFoldersRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MailFolder, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MailFoldersRequestBuilder) Get(q func (value *MailFoldersRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MailFoldersResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/attachments/attachments_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/attachments/attachments_request_builder.go index 2d57058ac..a47e306c6 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/attachments/attachments_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/attachments/attachments_request_builder.go @@ -7,10 +7,9 @@ import ( ) type AttachmentsRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type AttachmentsRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type AttachmentsRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewAttachmentsRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*AttachmentsRequestBuilder) { +func NewAttachmentsRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentsRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewAttachmentsRequestBuilderInternal(urlParams, requestAdapter) +} +func NewAttachmentsRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentsRequestBuilder) { m := &AttachmentsRequestBuilder{ } - m.pathSegment = "/attachments"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *AttachmentsRequestBuilder) CreateGetRequestInformation(q func (value *AttachmentsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(AttachmentsRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentsRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Attachment, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentsRequestBuilder) Get(q func (value *AttachmentsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*AttachmentsResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/attachments/item/attachment_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/attachments/item/attachment_request_builder.go index 14808cc29..e95487c21 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/attachments/item/attachment_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/attachments/item/attachment_request_builder.go @@ -7,99 +7,100 @@ import ( ) type AttachmentRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type AttachmentRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewAttachmentRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*AttachmentRequestBuilder) { +func NewAttachmentRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentRequestBuilder) { m := &AttachmentRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewAttachmentRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*AttachmentRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewAttachmentRequestBuilderInternal(urlParams, requestAdapter) +} func (m *AttachmentRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentRequestBuilder) CreateGetRequestInformation(q func (value *AttachmentRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(AttachmentRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Attachment, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *AttachmentRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/extensions/extensions_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/extensions/extensions_request_builder.go index bc5a589cd..5828755ae 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/extensions/extensions_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/extensions/extensions_request_builder.go @@ -7,10 +7,9 @@ import ( ) type ExtensionsRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type ExtensionsRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type ExtensionsRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewExtensionsRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ExtensionsRequestBuilder) { +func NewExtensionsRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionsRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewExtensionsRequestBuilderInternal(urlParams, requestAdapter) +} +func NewExtensionsRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionsRequestBuilder) { m := &ExtensionsRequestBuilder{ } - m.pathSegment = "/extensions"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *ExtensionsRequestBuilder) CreateGetRequestInformation(q func (value *ExtensionsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(ExtensionsRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionsRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Extension, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionsRequestBuilder) Get(q func (value *ExtensionsRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*ExtensionsResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/extensions/item/extension_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/extensions/item/extension_request_builder.go index ad86e7397..bb8da5685 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/extensions/item/extension_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/extensions/item/extension_request_builder.go @@ -7,99 +7,100 @@ import ( ) type ExtensionRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type ExtensionRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewExtensionRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ExtensionRequestBuilder) { +func NewExtensionRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionRequestBuilder) { m := &ExtensionRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewExtensionRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ExtensionRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewExtensionRequestBuilderInternal(urlParams, requestAdapter) +} func (m *ExtensionRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionRequestBuilder) CreateGetRequestInformation(q func (value *ExtensionRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(ExtensionRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Extension, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ExtensionRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/message_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/message_request_builder.go index 3f51630b9..38b4909a7 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/message_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/message_request_builder.go @@ -16,10 +16,9 @@ import ( ) type MessageRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MessageRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -27,97 +26,104 @@ type MessageRequestBuilderGetQueryParameters struct { Select_escpaped []string; } func (m *MessageRequestBuilder) Attachments()(i228962c2a18462bcfbde8557f6668f3fd7d4e68d5c7f3f1f3b675bc816866033.AttachmentsRequestBuilder) { - return *i228962c2a18462bcfbde8557f6668f3fd7d4e68d5c7f3f1f3b675bc816866033.NewAttachmentsRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i228962c2a18462bcfbde8557f6668f3fd7d4e68d5c7f3f1f3b675bc816866033.NewAttachmentsRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) AttachmentsById(id string)(idd4800ce8115a136eb3f42205c28105422c049d9e5b23796f3bdf18e2778f6d6.AttachmentRequestBuilder) { - return *idd4800ce8115a136eb3f42205c28105422c049d9e5b23796f3bdf18e2778f6d6.NewAttachmentRequestBuilder(m.currentPath + m.pathSegment + "/attachments/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["attachment_id"] = id + return *idd4800ce8115a136eb3f42205c28105422c049d9e5b23796f3bdf18e2778f6d6.NewAttachmentRequestBuilderInternal(urlTplParams, m.requestAdapter); } -func NewMessageRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MessageRequestBuilder) { +func NewMessageRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRequestBuilder) { m := &MessageRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMessageRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessageRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMessageRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MessageRequestBuilder) Content()(i9550b442511c46b7a974613d5ee3238fb100cef30fff0520a9682fb3d38ad326.ContentRequestBuilder) { - return *i9550b442511c46b7a974613d5ee3238fb100cef30fff0520a9682fb3d38ad326.NewContentRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i9550b442511c46b7a974613d5ee3238fb100cef30fff0520a9682fb3d38ad326.NewContentRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRequestBuilder) CreateGetRequestInformation(q func (value *MessageRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MessageRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessageRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); @@ -133,10 +139,15 @@ func (m *MessageRequestBuilder) Delete(h func (value map[string]string) (err err } } func (m *MessageRequestBuilder) Extensions()(i10075314d3b96cd3f0f2195562b0027395b41f6069ced9cc8d93624bbc206528.ExtensionsRequestBuilder) { - return *i10075314d3b96cd3f0f2195562b0027395b41f6069ced9cc8d93624bbc206528.NewExtensionsRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i10075314d3b96cd3f0f2195562b0027395b41f6069ced9cc8d93624bbc206528.NewExtensionsRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) ExtensionsById(id string)(i361d73846d6331cbbe8151dfaef3455f34e63dfa07626b67576681683b148587.ExtensionRequestBuilder) { - return *i361d73846d6331cbbe8151dfaef3455f34e63dfa07626b67576681683b148587.NewExtensionRequestBuilder(m.currentPath + m.pathSegment + "/extensions/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["extension_id"] = id + return *i361d73846d6331cbbe8151dfaef3455f34e63dfa07626b67576681683b148587.NewExtensionRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MessageRequestBuilder) Get(q func (value *MessageRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); @@ -152,10 +163,15 @@ func (m *MessageRequestBuilder) Get(q func (value *MessageRequestBuilderGetQuery } } func (m *MessageRequestBuilder) MultiValueExtendedProperties()(iadaad8f92ba85254c1d639d8a8cb86def5e843af4bc1062bc836f08d062196d6.MultiValueExtendedPropertiesRequestBuilder) { - return *iadaad8f92ba85254c1d639d8a8cb86def5e843af4bc1062bc836f08d062196d6.NewMultiValueExtendedPropertiesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *iadaad8f92ba85254c1d639d8a8cb86def5e843af4bc1062bc836f08d062196d6.NewMultiValueExtendedPropertiesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) MultiValueExtendedPropertiesById(id string)(if06dd322de6c7a1abe876d18d2ddc86a4b8bcf49f2fea78dcba12aff7dcb4994.MultiValueLegacyExtendedPropertyRequestBuilder) { - return *if06dd322de6c7a1abe876d18d2ddc86a4b8bcf49f2fea78dcba12aff7dcb4994.NewMultiValueLegacyExtendedPropertyRequestBuilder(m.currentPath + m.pathSegment + "/multiValueExtendedProperties/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["multiValueLegacyExtendedProperty_id"] = id + return *if06dd322de6c7a1abe876d18d2ddc86a4b8bcf49f2fea78dcba12aff7dcb4994.NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *MessageRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreatePatchRequestInformation(body, h, o); @@ -171,8 +187,13 @@ func (m *MessageRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8 } } func (m *MessageRequestBuilder) SingleValueExtendedProperties()(i170c26461395ae79c8485bb09f6acf415c54c121851bca73450cfff498f75eb8.SingleValueExtendedPropertiesRequestBuilder) { - return *i170c26461395ae79c8485bb09f6acf415c54c121851bca73450cfff498f75eb8.NewSingleValueExtendedPropertiesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i170c26461395ae79c8485bb09f6acf415c54c121851bca73450cfff498f75eb8.NewSingleValueExtendedPropertiesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *MessageRequestBuilder) SingleValueExtendedPropertiesById(id string)(i9f73052b0f535426cd146e9403e4e088995d624a331ea8cf19005e2c6ff46d7f.SingleValueLegacyExtendedPropertyRequestBuilder) { - return *i9f73052b0f535426cd146e9403e4e088995d624a331ea8cf19005e2c6ff46d7f.NewSingleValueLegacyExtendedPropertyRequestBuilder(m.currentPath + m.pathSegment + "/singleValueExtendedProperties/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["singleValueLegacyExtendedProperty_id"] = id + return *i9f73052b0f535426cd146e9403e4e088995d624a331ea8cf19005e2c6ff46d7f.NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlTplParams, m.requestAdapter); } diff --git a/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go index c45e5299c..783468862 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/item/multi_value_legacy_extended_property_request_builder.go @@ -7,99 +7,100 @@ import ( ) type MultiValueLegacyExtendedPropertyRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewMultiValueLegacyExtendedPropertyRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MultiValueLegacyExtendedPropertyRequestBuilder) { +func NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueLegacyExtendedPropertyRequestBuilder) { m := &MultiValueLegacyExtendedPropertyRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewMultiValueLegacyExtendedPropertyRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueLegacyExtendedPropertyRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMultiValueLegacyExtendedPropertyRequestBuilderInternal(urlParams, requestAdapter) +} func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreateGetRequestInformation(q func (value *MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MultiValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MultiValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueLegacyExtendedPropertyRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go index a04bf4f25..d5131f855 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/multivalueextendedproperties/multi_value_extended_properties_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MultiValueExtendedPropertiesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MultiValueExtendedPropertiesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MultiValueExtendedPropertiesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMultiValueExtendedPropertiesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MultiValueExtendedPropertiesRequestBuilder) { +func NewMultiValueExtendedPropertiesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueExtendedPropertiesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMultiValueExtendedPropertiesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMultiValueExtendedPropertiesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MultiValueExtendedPropertiesRequestBuilder) { m := &MultiValueExtendedPropertiesRequestBuilder{ } - m.pathSegment = "/multiValueExtendedProperties"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MultiValueExtendedPropertiesRequestBuilder) CreateGetRequestInformation(q func (value *MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueExtendedPropertiesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.MultiValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MultiValueExtendedPropertiesRequestBuilder) Get(q func (value *MultiValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MultiValueExtendedPropertiesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go index 0bc5e839d..74b723ad7 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/item/single_value_legacy_extended_property_request_builder.go @@ -7,99 +7,100 @@ import ( ) type SingleValueLegacyExtendedPropertyRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase Expand []string; Select_escpaped []string; } -func NewSingleValueLegacyExtendedPropertyRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*SingleValueLegacyExtendedPropertyRequestBuilder) { +func NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueLegacyExtendedPropertyRequestBuilder) { m := &SingleValueLegacyExtendedPropertyRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewSingleValueLegacyExtendedPropertyRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueLegacyExtendedPropertyRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewSingleValueLegacyExtendedPropertyRequestBuilderInternal(urlParams, requestAdapter) +} func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreateGetRequestInformation(q func (value *SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(SingleValueLegacyExtendedPropertyRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.SingleValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueLegacyExtendedPropertyRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) { requestInfo, err := m.CreateDeleteRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go index 7cc7879de..299cd0947 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/singlevalueextendedproperties/single_value_extended_properties_request_builder.go @@ -7,10 +7,9 @@ import ( ) type SingleValueExtendedPropertiesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type SingleValueExtendedPropertiesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type SingleValueExtendedPropertiesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewSingleValueExtendedPropertiesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*SingleValueExtendedPropertiesRequestBuilder) { +func NewSingleValueExtendedPropertiesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueExtendedPropertiesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewSingleValueExtendedPropertiesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewSingleValueExtendedPropertiesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*SingleValueExtendedPropertiesRequestBuilder) { m := &SingleValueExtendedPropertiesRequestBuilder{ } - m.pathSegment = "/singleValueExtendedProperties"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *SingleValueExtendedPropertiesRequestBuilder) CreateGetRequestInformation(q func (value *SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueExtendedPropertiesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.SingleValueLegacyExtendedProperty, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *SingleValueExtendedPropertiesRequestBuilder) Get(q func (value *SingleValueExtendedPropertiesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*SingleValueExtendedPropertiesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/item/value/content_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/item/value/content_request_builder.go index 3552e2ae0..8ad2349d9 100644 --- a/msgraph-mail/go/utilities/users/item/messages/item/value/content_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/item/value/content_request_builder.go @@ -5,62 +5,65 @@ import ( ) type ContentRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } -func NewContentRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*ContentRequestBuilder) { +func NewContentRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ContentRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewContentRequestBuilderInternal(urlParams, requestAdapter) +} +func NewContentRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*ContentRequestBuilder) { m := &ContentRequestBuilder{ } - m.pathSegment = "/$value"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *ContentRequestBuilder) CreateGetRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ContentRequestBuilder) CreatePutRequestInformation(body []byte, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PUT - if err != nil { - return nil, err - } requestInfo.SetStreamContent(body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *ContentRequestBuilder) Get(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() ([]byte, error)) { requestInfo, err := m.CreateGetRequestInformation(h, o); diff --git a/msgraph-mail/go/utilities/users/item/messages/messages_request_builder.go b/msgraph-mail/go/utilities/users/item/messages/messages_request_builder.go index 6982880c2..b54c22f16 100644 --- a/msgraph-mail/go/utilities/users/item/messages/messages_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/messages/messages_request_builder.go @@ -7,10 +7,9 @@ import ( ) type MessagesRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } type MessagesRequestBuilderGetQueryParameters struct { ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase @@ -23,68 +22,72 @@ type MessagesRequestBuilderGetQueryParameters struct { Skip *int32; Top *int32; } -func NewMessagesRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*MessagesRequestBuilder) { +func NewMessagesRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessagesRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewMessagesRequestBuilderInternal(urlParams, requestAdapter) +} +func NewMessagesRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*MessagesRequestBuilder) { m := &MessagesRequestBuilder{ } - m.pathSegment = "/messages"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } func (m *MessagesRequestBuilder) CreateGetRequestInformation(q func (value *MessagesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET - if err != nil { - return nil, err - } if q != nil { qParams := new(MessagesRequestBuilderGetQueryParameters) - err = q(qParams) + err := q(qParams) if err != nil { return nil, err } - err := qParams.AddQueryParameters(requestInfo.QueryParameters) + err = qParams.AddQueryParameters(requestInfo.QueryParameters) if err != nil { return nil, err } } if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessagesRequestBuilder) CreatePostRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.Message, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) { requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation() - err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl) + requestInfo.UrlTemplate = m.urlTemplate + requestInfo.UrlTemplateParameters = m.urlTemplateParameters requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.POST - if err != nil { - return nil, err - } requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body) if h != nil { - err = h(requestInfo.Headers) + err := h(requestInfo.Headers) if err != nil { return nil, err } } if o != nil { - err = requestInfo.AddRequestOptions(o) + err := requestInfo.AddRequestOptions(o) if err != nil { return nil, err } } - return requestInfo, err + return requestInfo, nil } func (m *MessagesRequestBuilder) Get(q func (value *MessagesRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (*MessagesResponse, error)) { requestInfo, err := m.CreateGetRequestInformation(q, h, o); diff --git a/msgraph-mail/go/utilities/users/item/user_request_builder.go b/msgraph-mail/go/utilities/users/item/user_request_builder.go index ace0e5f18..fc090d28b 100644 --- a/msgraph-mail/go/utilities/users/item/user_request_builder.go +++ b/msgraph-mail/go/utilities/users/item/user_request_builder.go @@ -10,32 +10,49 @@ import ( ) type UserRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } -func NewUserRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*UserRequestBuilder) { +func NewUserRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*UserRequestBuilder) { m := &UserRequestBuilder{ } - m.pathSegment = ""; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } +func NewUserRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*UserRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewUserRequestBuilderInternal(urlParams, requestAdapter) +} func (m *UserRequestBuilder) InferenceClassification()(i9bcbbe222fda57b1c7f212f812b862b760156d2d3a9d1e157ee4f76841199559.InferenceClassificationRequestBuilder) { - return *i9bcbbe222fda57b1c7f212f812b862b760156d2d3a9d1e157ee4f76841199559.NewInferenceClassificationRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i9bcbbe222fda57b1c7f212f812b862b760156d2d3a9d1e157ee4f76841199559.NewInferenceClassificationRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *UserRequestBuilder) MailFolders()(ib8edbc02a502b08756d43d6d66bfafac60ac37ce024db3b7e881dc17cea846a8.MailFoldersRequestBuilder) { - return *ib8edbc02a502b08756d43d6d66bfafac60ac37ce024db3b7e881dc17cea846a8.NewMailFoldersRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *ib8edbc02a502b08756d43d6d66bfafac60ac37ce024db3b7e881dc17cea846a8.NewMailFoldersRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *UserRequestBuilder) MailFoldersById(id string)(if937953a6e06f9e461297be544e9a26dbe87704845fad3ae4b78b2ca32d53222.MailFolderRequestBuilder) { - return *if937953a6e06f9e461297be544e9a26dbe87704845fad3ae4b78b2ca32d53222.NewMailFolderRequestBuilder(m.currentPath + m.pathSegment + "/mailFolders/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["mailFolder_id"] = id + return *if937953a6e06f9e461297be544e9a26dbe87704845fad3ae4b78b2ca32d53222.NewMailFolderRequestBuilderInternal(urlTplParams, m.requestAdapter); } func (m *UserRequestBuilder) Messages()(i341158d6b31e193c6856ef08d3a5c0a9d9c9674cd883d99b10844de8d933df7a.MessagesRequestBuilder) { - return *i341158d6b31e193c6856ef08d3a5c0a9d9c9674cd883d99b10844de8d933df7a.NewMessagesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false); + return *i341158d6b31e193c6856ef08d3a5c0a9d9c9674cd883d99b10844de8d933df7a.NewMessagesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter); } func (m *UserRequestBuilder) MessagesById(id string)(ia31bb5deda23f2b146eb943e6d6e68f69c1487606651126c6dbde9f9b4b6ae99.MessageRequestBuilder) { - return *ia31bb5deda23f2b146eb943e6d6e68f69c1487606651126c6dbde9f9b4b6ae99.NewMessageRequestBuilder(m.currentPath + m.pathSegment + "/messages/" + id, m.requestAdapter, false); + urlTplParams := make(map[string]string) + for idx, item := range m.urlTemplateParameters { + urlTplParams[idx] = item + } + urlTplParams["message_id"] = id + return *ia31bb5deda23f2b146eb943e6d6e68f69c1487606651126c6dbde9f9b4b6ae99.NewMessageRequestBuilderInternal(urlTplParams, m.requestAdapter); } diff --git a/msgraph-mail/go/utilities/users/users_request_builder.go b/msgraph-mail/go/utilities/users/users_request_builder.go index 96a582c73..993de61e4 100644 --- a/msgraph-mail/go/utilities/users/users_request_builder.go +++ b/msgraph-mail/go/utilities/users/users_request_builder.go @@ -5,17 +5,24 @@ import ( ) type UsersRequestBuilder struct { - currentPath string; - isRawUrl bool; - pathSegment string; requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter; + urlTemplate string; + urlTemplateParameters map[string]string; } -func NewUsersRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*UsersRequestBuilder) { +func NewUsersRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*UsersRequestBuilder) { + urlParams := make(map[string]string) + urlParams["raw-request-url"] = rawUrl + return NewUsersRequestBuilderInternal(urlParams, requestAdapter) +} +func NewUsersRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*UsersRequestBuilder) { m := &UsersRequestBuilder{ } - m.pathSegment = "/users"; + m.urlTemplate = "https://graph.microsoft.com/v1.0/users"; + urlTplParams := make(map[string]string) + for idx, item := range urlTemplateParameters { + urlTplParams[idx] = item + } + m.urlTemplateParameters = urlTemplateParameters; m.requestAdapter = requestAdapter; - m.currentPath = currentPath; - m.isRawUrl = isRawUrl; return m } From 6af33b2d353dfbde9eaecc75dfa7d0ec4dd7c16a Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 20 Oct 2021 10:42:21 -0400 Subject: [PATCH 08/14] - code-gen : Java deterministic order --- .../utilities/users/UsersRequestBuilder.java | 2 +- .../users/item/UserRequestBuilder.java | 2 +- .../InferenceClassificationRequestBuilder.java | 18 +++++++++--------- .../overrides/OverridesRequestBuilder.java | 18 +++++++++--------- ...ceClassificationOverrideRequestBuilder.java | 18 +++++++++--------- .../mailFolders/MailFoldersRequestBuilder.java | 18 +++++++++--------- .../item/MailFolderRequestBuilder.java | 18 +++++++++--------- .../ChildFoldersRequestBuilder.java | 18 +++++++++--------- .../item/MailFolderRequestBuilder.java | 18 +++++++++--------- .../MessageRulesRequestBuilder.java | 18 +++++++++--------- .../item/MessageRuleRequestBuilder.java | 18 +++++++++--------- .../item/messages/MessagesRequestBuilder.java | 18 +++++++++--------- .../messages/item/MessageRequestBuilder.java | 18 +++++++++--------- .../attachments/AttachmentsRequestBuilder.java | 18 +++++++++--------- .../item/AttachmentRequestBuilder.java | 18 +++++++++--------- .../extensions/ExtensionsRequestBuilder.java | 18 +++++++++--------- .../item/ExtensionRequestBuilder.java | 18 +++++++++--------- ...iValueExtendedPropertiesRequestBuilder.java | 18 +++++++++--------- ...ueLegacyExtendedPropertyRequestBuilder.java | 18 +++++++++--------- ...eValueExtendedPropertiesRequestBuilder.java | 18 +++++++++--------- ...ueLegacyExtendedPropertyRequestBuilder.java | 18 +++++++++--------- .../item/value/ContentRequestBuilder.java | 18 +++++++++--------- ...iValueExtendedPropertiesRequestBuilder.java | 18 +++++++++--------- ...ueLegacyExtendedPropertyRequestBuilder.java | 18 +++++++++--------- ...eValueExtendedPropertiesRequestBuilder.java | 18 +++++++++--------- ...ueLegacyExtendedPropertyRequestBuilder.java | 18 +++++++++--------- .../item/messages/MessagesRequestBuilder.java | 18 +++++++++--------- .../messages/item/MessageRequestBuilder.java | 18 +++++++++--------- .../attachments/AttachmentsRequestBuilder.java | 18 +++++++++--------- .../item/AttachmentRequestBuilder.java | 18 +++++++++--------- .../extensions/ExtensionsRequestBuilder.java | 18 +++++++++--------- .../item/ExtensionRequestBuilder.java | 18 +++++++++--------- ...iValueExtendedPropertiesRequestBuilder.java | 18 +++++++++--------- ...ueLegacyExtendedPropertyRequestBuilder.java | 18 +++++++++--------- ...eValueExtendedPropertiesRequestBuilder.java | 18 +++++++++--------- ...ueLegacyExtendedPropertyRequestBuilder.java | 18 +++++++++--------- .../item/value/ContentRequestBuilder.java | 18 +++++++++--------- 37 files changed, 317 insertions(+), 317 deletions(-) diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java index 7f8b075f5..406b90e28 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java @@ -31,7 +31,7 @@ public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap(); urlTplParams.put("request-raw-url", rawUrl); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java index 883bf0d9f..5b50eac43 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java @@ -48,7 +48,7 @@ public UserRequestBuilder(@javax.annotation.Nonnull final HashMap(); urlTplParams.put("request-raw-url", rawUrl); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java index 8de1ef2c6..6e5a9e981 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java @@ -29,28 +29,28 @@ public OverridesRequestBuilder overrides() { private final HashMap urlTemplateParameters; /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java index c0c6fb666..d97cf79ea 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java @@ -23,28 +23,28 @@ public class OverridesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new OverridesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public OverridesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new OverridesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public OverridesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java index 28bd552f3..bf09cc1aa 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java @@ -23,28 +23,28 @@ public class InferenceClassificationOverrideRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java index 3dd416983..b854fb185 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java @@ -23,28 +23,28 @@ public class MailFoldersRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MailFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java index ac8adaf47..c772b480f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java @@ -64,28 +64,28 @@ public MailFolderRequestBuilder childFolders(@javax.annotation.Nonnull final Str } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java index 4c09b781d..afb3f5344 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java @@ -23,28 +23,28 @@ public class ChildFoldersRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java index 405eba722..69459f709 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java @@ -23,28 +23,28 @@ public class MailFolderRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java index bf5b384c8..ad3d08101 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java @@ -23,28 +23,28 @@ public class MessageRulesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRulesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MessageRulesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java index 1c4d760b3..6743c9c61 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java @@ -23,28 +23,28 @@ public class MessageRuleRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRuleRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MessageRuleRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java index 1b1a81769..1f260bad5 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java @@ -23,28 +23,28 @@ public class MessagesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MessagesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java index 5703909ab..1bdf51bfe 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java @@ -64,28 +64,28 @@ public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final Stri } /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java index b53df07c6..264c028bf 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -23,28 +23,28 @@ public class AttachmentsRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java index dcb95a268..d5f19c8c7 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -23,28 +23,28 @@ public class AttachmentRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java index 8dfb412ef..1a92babe4 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -23,28 +23,28 @@ public class ExtensionsRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java index 49a4d7e9f..26082e24b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -23,28 +23,28 @@ public class ExtensionRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index 1609d962b..cb8f0bb68 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -23,28 +23,28 @@ public class MultiValueExtendedPropertiesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 573983679..d9077d2cf 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -23,28 +23,28 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 332100c2e..fdff6ec3d 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -23,28 +23,28 @@ public class SingleValueExtendedPropertiesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index 21fb04c81..90a10a89b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -23,28 +23,28 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java index 3e2dfee1a..79d15cb0a 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java @@ -22,28 +22,28 @@ public class ContentRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ContentRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index e386dd361..3b4594e78 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -23,28 +23,28 @@ public class MultiValueExtendedPropertiesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index d37fb7ab3..1073a66ac 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -23,28 +23,28 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 55f8cba74..239dfa9a5 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -23,28 +23,28 @@ public class SingleValueExtendedPropertiesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index d6fc98cbe..d439fbe25 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -23,28 +23,28 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java index d9ee23176..fa543583d 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java @@ -23,28 +23,28 @@ public class MessagesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MessagesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MessagesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java index 720e691f6..cabe63c2b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java @@ -64,28 +64,28 @@ public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final Stri } /** * Instantiates a new MessageRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MessageRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java index c45166189..5892b6df5 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -23,28 +23,28 @@ public class AttachmentsRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java index 770763436..d0191149b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -23,28 +23,28 @@ public class AttachmentRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new AttachmentRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java index 65eeee51c..ca5450efd 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -23,28 +23,28 @@ public class ExtensionsRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java index e9b70da98..7237933f9 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -23,28 +23,28 @@ public class ExtensionRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ExtensionRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index f8ac1dff0..043a759f6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -23,28 +23,28 @@ public class MultiValueExtendedPropertiesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 95eb031ba..98409c240 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -23,28 +23,28 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index c58c02578..452014e7d 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -23,28 +23,28 @@ public class SingleValueExtendedPropertiesRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index 881585cbf..f26d50a23 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -23,28 +23,28 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java index 0fa4f4f6d..17adb2af7 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java @@ -22,28 +22,28 @@ public class ContentRequestBuilder { private final HashMap urlTemplateParameters; /** * Instantiates a new ContentRequestBuilder and sets the default values. - * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. + * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, final RequestAdapter requestAdapter) { + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(requestAdapter); + Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(); - urlTplParams.put("request-raw-url", rawUrl); + var urlTplParams = new HashMap(urlTemplateParameters); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** * Instantiates a new ContentRequestBuilder and sets the default values. + * @param rawUrl The raw URL to use for the request builder. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { - Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); + public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(urlTemplateParameters); + var urlTplParams = new HashMap(); + urlTplParams.put("request-raw-url", rawUrl); this.urlTemplateParameters = urlTplParams; this.requestAdapter = requestAdapter; } From 86cc905509e652b32a5ebb4afa8dac5d1a7432fe Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 20 Oct 2021 10:45:09 -0400 Subject: [PATCH 09/14] - code-gen : CSharp deterministic order --- .../ChildFolders/ChildFoldersRequestBuilder.cs | 18 +++++++++--------- .../Item/MailFolderRequestBuilder.cs | 18 +++++++++--------- .../Messages/Item/MessageRequestBuilder.cs | 18 +++++++++--------- ...ltiValueExtendedPropertiesRequestBuilder.cs | 18 +++++++++--------- ...ltiValueExtendedPropertiesRequestBuilder.cs | 18 +++++++++--------- .../MailFolders/MailFoldersRequestBuilder.cs | 18 +++++++++--------- .../Messages/Item/MessageRequestBuilder.cs | 18 +++++++++--------- ...ltiValueExtendedPropertiesRequestBuilder.cs | 18 +++++++++--------- 8 files changed, 72 insertions(+), 72 deletions(-) diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs index b4c11fbe9..0e2029d16 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs @@ -24,28 +24,28 @@ public MailFolderRequestBuilder this[string position] { get { } } /// /// Instantiates a new ChildFoldersRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public ChildFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public ChildFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new ChildFoldersRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ChildFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ChildFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs index b23c2ccb6..0ae0b6cea 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs @@ -37,28 +37,28 @@ public class MailFolderRequestBuilder { private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MailFolderRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MailFolderRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs index fbb415f08..2b5c08ef5 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs @@ -37,28 +37,28 @@ public class MessageRequestBuilder { private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index e7b7cf8df..54c55c074 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -24,28 +24,28 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 032e0a3f1..4bf2f27b3 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -24,28 +24,28 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs index 7ad42b373..5057fcca2 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs @@ -24,28 +24,28 @@ public MailFolderRequestBuilder this[string position] { get { } } /// /// Instantiates a new MailFoldersRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MailFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MailFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MailFoldersRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MailFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MailFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs index 83a00f465..0314459ef 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs @@ -37,28 +37,28 @@ public class MessageRequestBuilder { private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 0d0f6f4ed..8bf90dccf 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -24,28 +24,28 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. + /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { - if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); + public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); + _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); - urlTplParams.Add("request-raw-url", rawUrl); + var urlTplParams = new Dictionary(urlTemplateParameters); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// The raw URL to use for the request builder. /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { + if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); + var urlTplParams = new Dictionary(); + urlTplParams.Add("request-raw-url", rawUrl); UrlTemplateParameters = urlTplParams; RequestAdapter = requestAdapter; } From f497242225db6bc05ae03394e745f704bc686418 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 20 Oct 2021 10:48:00 -0400 Subject: [PATCH 10/14] - code-gen : TS deterministic order --- msgraph-mail/typescript/src/apiClient.ts | 4 ++-- .../inferenceClassificationRequestBuilder.ts | 4 ++-- .../inferenceClassificationOverrideRequestBuilder.ts | 2 +- .../overrides/overridesRequestBuilder.ts | 2 +- .../item/childFolders/childFoldersRequestBuilder.ts | 2 +- .../childFolders/item/mailFolderRequestBuilder.ts | 2 +- .../mailFolders/item/mailFolderRequestBuilder.ts | 12 ++++++------ .../messageRules/item/messageRuleRequestBuilder.ts | 2 +- .../item/messageRules/messageRulesRequestBuilder.ts | 2 +- .../item/attachments/attachmentsRequestBuilder.ts | 2 +- .../attachments/item/attachmentRequestBuilder.ts | 2 +- .../item/extensions/extensionsRequestBuilder.ts | 2 +- .../item/extensions/item/extensionRequestBuilder.ts | 2 +- .../item/messages/item/messageRequestBuilder.ts | 10 +++++----- ...multiValueLegacyExtendedPropertyRequestBuilder.ts | 2 +- .../multiValueExtendedPropertiesRequestBuilder.ts | 2 +- ...ingleValueLegacyExtendedPropertyRequestBuilder.ts | 2 +- .../singleValueExtendedPropertiesRequestBuilder.ts | 2 +- .../messages/item/value/contentRequestBuilder.ts | 2 +- .../item/messages/messagesRequestBuilder.ts | 2 +- ...multiValueLegacyExtendedPropertyRequestBuilder.ts | 2 +- .../multiValueExtendedPropertiesRequestBuilder.ts | 2 +- ...ingleValueLegacyExtendedPropertyRequestBuilder.ts | 2 +- .../singleValueExtendedPropertiesRequestBuilder.ts | 2 +- .../item/mailFolders/mailFoldersRequestBuilder.ts | 2 +- .../item/attachments/attachmentsRequestBuilder.ts | 2 +- .../attachments/item/attachmentRequestBuilder.ts | 2 +- .../item/extensions/extensionsRequestBuilder.ts | 2 +- .../item/extensions/item/extensionRequestBuilder.ts | 2 +- .../item/messages/item/messageRequestBuilder.ts | 10 +++++----- ...multiValueLegacyExtendedPropertyRequestBuilder.ts | 2 +- .../multiValueExtendedPropertiesRequestBuilder.ts | 2 +- ...ingleValueLegacyExtendedPropertyRequestBuilder.ts | 2 +- .../singleValueExtendedPropertiesRequestBuilder.ts | 2 +- .../messages/item/value/contentRequestBuilder.ts | 2 +- .../users/item/messages/messagesRequestBuilder.ts | 2 +- .../typescript/src/users/item/userRequestBuilder.ts | 6 +++--- .../typescript/src/users/usersRequestBuilder.ts | 2 +- 38 files changed, 55 insertions(+), 55 deletions(-) diff --git a/msgraph-mail/typescript/src/apiClient.ts b/msgraph-mail/typescript/src/apiClient.ts index 7186cb158..abf98ba55 100644 --- a/msgraph-mail/typescript/src/apiClient.ts +++ b/msgraph-mail/typescript/src/apiClient.ts @@ -1,6 +1,6 @@ import {UserRequestBuilder} from './users/item/userRequestBuilder'; import {UsersRequestBuilder} from './users/usersRequestBuilder'; -import {RequestAdapter, getUrlTemplateParameters, registerDefaultSerializer, enableBackingStoreForSerializationWriterFactory, SerializationWriterFactoryRegistry, registerDefaultDeserializer, ParseNodeFactoryRegistry} from '@microsoft/kiota-abstractions'; +import {enableBackingStoreForSerializationWriterFactory, getUrlTemplateParameters, ParseNodeFactoryRegistry, registerDefaultDeserializer, registerDefaultSerializer, RequestAdapter, SerializationWriterFactoryRegistry} from '@microsoft/kiota-abstractions'; import {JsonParseNodeFactory, JsonSerializationWriterFactory} from '@microsoft/kiota-serialization-json'; /** The main entry point of the SDK, exposes the configuration and the fluent API. */ @@ -34,7 +34,7 @@ export class ApiClient { public usersById(id: string) : UserRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("user_id", id); + id && urlTplParams.set("user_id", id); return new UserRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts index bb7dc9acd..8499a2825 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts @@ -1,7 +1,7 @@ import {InferenceClassification} from '../../../models/microsoft/graph/inferenceClassification'; import {InferenceClassificationOverrideRequestBuilder} from './overrides/item/inferenceClassificationOverrideRequestBuilder'; import {OverridesRequestBuilder} from './overrides/overridesRequestBuilder'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification */ export class InferenceClassificationRequestBuilder { @@ -117,7 +117,7 @@ export class InferenceClassificationRequestBuilder { public overridesById(id: string) : InferenceClassificationOverrideRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("inferenceClassificationOverride_id", id); + id && urlTplParams.set("inferenceClassificationOverride_id", id); return new InferenceClassificationOverrideRequestBuilder(urlTplParams, this.requestAdapter); }; /** diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts index 16e0b7599..67f16f188 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts @@ -1,5 +1,5 @@ import {InferenceClassificationOverride} from '../../../../../models/microsoft/graph/inferenceClassificationOverride'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ export class InferenceClassificationOverrideRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts index a6e4a300b..85a5fec24 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts @@ -1,6 +1,6 @@ import {InferenceClassificationOverride} from '../../../../models/microsoft/graph/inferenceClassificationOverride'; import {OverridesResponse} from './overridesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ export class OverridesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts index 34c1a947f..3c17ecd57 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts @@ -1,6 +1,6 @@ import {MailFolder} from '../../../../../models/microsoft/graph/mailFolder'; import {ChildFoldersResponse} from './childFoldersResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ export class ChildFoldersRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts index 2ed6413e3..59d07c908 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts @@ -1,5 +1,5 @@ import {MailFolder} from '../../../../../../models/microsoft/graph/mailFolder'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ export class MailFolderRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts index 84dae6b14..45f8161dc 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts @@ -9,7 +9,7 @@ import {MultiValueLegacyExtendedPropertyRequestBuilder} from './multiValueExtend import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder'; import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id} */ export class MailFolderRequestBuilder { @@ -42,7 +42,7 @@ export class MailFolderRequestBuilder { public childFoldersById(id: string) : i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8 { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("mailFolder_id1", id); + id && urlTplParams.set("mailFolder_id1", id); return new i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8(urlTplParams, this.requestAdapter); }; /** @@ -148,7 +148,7 @@ export class MailFolderRequestBuilder { public messageRulesById(id: string) : MessageRuleRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("messageRule_id", id); + id && urlTplParams.set("messageRule_id", id); return new MessageRuleRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -159,7 +159,7 @@ export class MailFolderRequestBuilder { public messagesById(id: string) : MessageRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("message_id", id); + id && urlTplParams.set("message_id", id); return new MessageRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -170,7 +170,7 @@ export class MailFolderRequestBuilder { public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("multiValueLegacyExtendedProperty_id", id); + id && urlTplParams.set("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -195,7 +195,7 @@ export class MailFolderRequestBuilder { public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("singleValueLegacyExtendedProperty_id", id); + id && urlTplParams.set("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts index 2a708e904..936ba4892 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts @@ -1,5 +1,5 @@ import {MessageRule} from '../../../../../../models/microsoft/graph/messageRule'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ export class MessageRuleRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts index 05b0b7912..4a04826e3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts @@ -1,6 +1,6 @@ import {MessageRule} from '../../../../../models/microsoft/graph/messageRule'; import {MessageRulesResponse} from './messageRulesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ export class MessageRulesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts index 92e80705f..1bca045bf 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -1,6 +1,6 @@ import {Attachment} from '../../../../../../../models/microsoft/graph/attachment'; import {AttachmentsResponse} from './attachmentsResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts index 339f790ed..86a51474c 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -1,5 +1,5 @@ import {Attachment} from '../../../../../../../../models/microsoft/graph/attachment'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts index 3328c7ffd..74b72c30c 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -1,6 +1,6 @@ import {Extension} from '../../../../../../../models/microsoft/graph/extension'; import {ExtensionsResponse} from './extensionsResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts index 3c319541d..1a01f2dba 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -1,5 +1,5 @@ import {Extension} from '../../../../../../../../models/microsoft/graph/extension'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts index 8f997e0d7..14b24b8a1 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts @@ -8,7 +8,7 @@ import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedPr import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; import {ContentRequestBuilder} from './value/contentRequestBuilder'; -import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id} */ export class MessageRequestBuilder { @@ -41,7 +41,7 @@ export class MessageRequestBuilder { public attachmentsById(id: string) : AttachmentRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("attachment_id", id); + id && urlTplParams.set("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -130,7 +130,7 @@ export class MessageRequestBuilder { public extensionsById(id: string) : ExtensionRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("extension_id", id); + id && urlTplParams.set("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -158,7 +158,7 @@ export class MessageRequestBuilder { public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("multiValueLegacyExtendedProperty_id", id); + id && urlTplParams.set("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -183,7 +183,7 @@ export class MessageRequestBuilder { public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("singleValueLegacyExtendedProperty_id", id); + id && urlTplParams.set("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 6c4184d01..0ff2ed863 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,5 +1,5 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index 5b3c03b3f..ba8de2208 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,6 +1,6 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 3a787f6c3..ec151e550 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,5 +1,5 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 102c72112..c9ab717bb 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,6 +1,6 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts index 357fd97b3..434fd39a2 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts @@ -1,4 +1,4 @@ -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts index 1d11a05f3..fe0a5910b 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts @@ -1,6 +1,6 @@ import {Message} from '../../../../../models/microsoft/graph/message'; import {MessagesResponse} from './messagesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ export class MessagesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index c86a5878c..6f739d773 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,5 +1,5 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index dbeb2cf2f..107308e76 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,6 +1,6 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 61d6feb0e..ab20ab871 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,5 +1,5 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 8db22bbb3..80136e02e 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,6 +1,6 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts index edf5e8aba..a2e651a20 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts @@ -1,6 +1,6 @@ import {MailFolder} from '../../../models/microsoft/graph/mailFolder'; import {MailFoldersResponse} from './mailFoldersResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ export class MailFoldersRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts index ef4de94d8..019d85079 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -1,6 +1,6 @@ import {Attachment} from '../../../../../models/microsoft/graph/attachment'; import {AttachmentsResponse} from './attachmentsResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts index e1d8913a6..c79a414d6 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -1,5 +1,5 @@ import {Attachment} from '../../../../../../models/microsoft/graph/attachment'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts index 55c0590c3..af273b03b 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -1,6 +1,6 @@ import {Extension} from '../../../../../models/microsoft/graph/extension'; import {ExtensionsResponse} from './extensionsResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts index ee032e40c..14d8bcd63 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -1,5 +1,5 @@ import {Extension} from '../../../../../../models/microsoft/graph/extension'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts index ffdf5814c..cba458659 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts @@ -8,7 +8,7 @@ import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedPr import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; import {ContentRequestBuilder} from './value/contentRequestBuilder'; -import {ResponseHandler, Parsable, HttpMethod, RequestInformation, RequestOption, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id} */ export class MessageRequestBuilder { @@ -41,7 +41,7 @@ export class MessageRequestBuilder { public attachmentsById(id: string) : AttachmentRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("attachment_id", id); + id && urlTplParams.set("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -130,7 +130,7 @@ export class MessageRequestBuilder { public extensionsById(id: string) : ExtensionRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("extension_id", id); + id && urlTplParams.set("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -158,7 +158,7 @@ export class MessageRequestBuilder { public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("multiValueLegacyExtendedProperty_id", id); + id && urlTplParams.set("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -183,7 +183,7 @@ export class MessageRequestBuilder { public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("singleValueLegacyExtendedProperty_id", id); + id && urlTplParams.set("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 0b8d4c451..61f041d8a 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,5 +1,5 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index ce7e8ec86..e87392cf1 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,6 +1,6 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index f0bd559f2..e30bea53e 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,5 +1,5 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 4b834fa30..6136148db 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,6 +1,6 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts index 97c8e366d..16c9d72a9 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts @@ -1,4 +1,4 @@ -import {HttpMethod, RequestInformation, RequestOption, ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ diff --git a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts index 54c08daf5..e13104a29 100644 --- a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts @@ -1,6 +1,6 @@ import {Message} from '../../../models/microsoft/graph/message'; import {MessagesResponse} from './messagesResponse'; -import {ResponseHandler, Parsable, RequestAdapter, getUrlTemplateParameters, HttpMethod, RequestInformation, RequestOption} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages */ export class MessagesRequestBuilder { diff --git a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts index 65b2f6e9f..ae2d5a968 100644 --- a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts @@ -3,7 +3,7 @@ import {MailFolderRequestBuilder} from './mailFolders/item/mailFolderRequestBuil import {MailFoldersRequestBuilder} from './mailFolders/mailFoldersRequestBuilder'; import {MessageRequestBuilder} from './messages/item/messageRequestBuilder'; import {MessagesRequestBuilder} from './messages/messagesRequestBuilder'; -import {RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id} */ export class UserRequestBuilder { @@ -43,7 +43,7 @@ export class UserRequestBuilder { public mailFoldersById(id: string) : MailFolderRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("mailFolder_id", id); + id && urlTplParams.set("mailFolder_id", id); return new MailFolderRequestBuilder(urlTplParams, this.requestAdapter); }; /** @@ -54,7 +54,7 @@ export class UserRequestBuilder { public messagesById(id: string) : MessageRequestBuilder { if(!id) throw new Error("id cannot be undefined"); const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); - urlTplParams.set("message_id", id); + id && urlTplParams.set("message_id", id); return new MessageRequestBuilder(urlTplParams, this.requestAdapter); }; } diff --git a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts index c375c4fbf..86601b4c0 100644 --- a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts @@ -1,4 +1,4 @@ -import {RequestAdapter, getUrlTemplateParameters} from '@microsoft/kiota-abstractions'; +import {getUrlTemplateParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users */ export class UsersRequestBuilder { From 6ee52debb40792a756b79b03ed8bcc571636c374 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 20 Oct 2021 11:26:59 -0400 Subject: [PATCH 11/14] - code-gen: CS/TS/JAVA url template parameters property rename --- msgraph-mail/dotnet/ApiClient.cs | 8 ++-- .../InferenceClassificationRequestBuilder.cs | 24 +++++------ ...nceClassificationOverrideRequestBuilder.cs | 22 +++++----- .../Overrides/OverridesRequestBuilder.cs | 22 +++++----- .../ChildFoldersRequestBuilder.cs | 22 +++++----- .../Item/MailFolderRequestBuilder.cs | 22 +++++----- .../Item/MailFolderRequestBuilder.cs | 32 +++++++------- .../Item/MessageRuleRequestBuilder.cs | 22 +++++----- .../MessageRulesRequestBuilder.cs | 22 +++++----- .../Attachments/AttachmentsRequestBuilder.cs | 22 +++++----- .../Item/AttachmentRequestBuilder.cs | 22 +++++----- .../Extensions/ExtensionsRequestBuilder.cs | 22 +++++----- .../Item/ExtensionRequestBuilder.cs | 22 +++++----- .../Messages/Item/MessageRequestBuilder.cs | 32 +++++++------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 22 +++++----- ...tiValueExtendedPropertiesRequestBuilder.cs | 22 +++++----- ...lueLegacyExtendedPropertyRequestBuilder.cs | 22 +++++----- ...leValueExtendedPropertiesRequestBuilder.cs | 22 +++++----- .../Item/Value/ContentRequestBuilder.cs | 20 ++++----- .../Item/Messages/MessagesRequestBuilder.cs | 22 +++++----- ...lueLegacyExtendedPropertyRequestBuilder.cs | 22 +++++----- ...tiValueExtendedPropertiesRequestBuilder.cs | 22 +++++----- ...lueLegacyExtendedPropertyRequestBuilder.cs | 22 +++++----- ...leValueExtendedPropertiesRequestBuilder.cs | 22 +++++----- .../MailFolders/MailFoldersRequestBuilder.cs | 22 +++++----- .../Attachments/AttachmentsRequestBuilder.cs | 22 +++++----- .../Item/AttachmentRequestBuilder.cs | 22 +++++----- .../Extensions/ExtensionsRequestBuilder.cs | 22 +++++----- .../Item/ExtensionRequestBuilder.cs | 22 +++++----- .../Messages/Item/MessageRequestBuilder.cs | 32 +++++++------- ...lueLegacyExtendedPropertyRequestBuilder.cs | 22 +++++----- ...tiValueExtendedPropertiesRequestBuilder.cs | 22 +++++----- ...lueLegacyExtendedPropertyRequestBuilder.cs | 22 +++++----- ...leValueExtendedPropertiesRequestBuilder.cs | 22 +++++----- .../Item/Value/ContentRequestBuilder.cs | 20 ++++----- .../Item/Messages/MessagesRequestBuilder.cs | 22 +++++----- .../dotnet/Users/Item/UserRequestBuilder.cs | 22 +++++----- .../dotnet/Users/UsersRequestBuilder.cs | 18 ++++---- .../java/graphjavav4/utilities/ApiClient.java | 10 ++--- .../utilities/users/UsersRequestBuilder.java | 16 +++---- .../users/item/UserRequestBuilder.java | 26 ++++++------ ...InferenceClassificationRequestBuilder.java | 26 ++++++------ .../overrides/OverridesRequestBuilder.java | 20 ++++----- ...eClassificationOverrideRequestBuilder.java | 22 +++++----- .../MailFoldersRequestBuilder.java | 20 ++++----- .../item/MailFolderRequestBuilder.java | 42 +++++++++---------- .../ChildFoldersRequestBuilder.java | 20 ++++----- .../item/MailFolderRequestBuilder.java | 22 +++++----- .../MessageRulesRequestBuilder.java | 20 ++++----- .../item/MessageRuleRequestBuilder.java | 22 +++++----- .../item/messages/MessagesRequestBuilder.java | 20 ++++----- .../messages/item/MessageRequestBuilder.java | 40 +++++++++--------- .../AttachmentsRequestBuilder.java | 20 ++++----- .../item/AttachmentRequestBuilder.java | 22 +++++----- .../extensions/ExtensionsRequestBuilder.java | 20 ++++----- .../item/ExtensionRequestBuilder.java | 22 +++++----- ...ValueExtendedPropertiesRequestBuilder.java | 20 ++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 22 +++++----- ...ValueExtendedPropertiesRequestBuilder.java | 20 ++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 22 +++++----- .../item/value/ContentRequestBuilder.java | 20 ++++----- ...ValueExtendedPropertiesRequestBuilder.java | 20 ++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 22 +++++----- ...ValueExtendedPropertiesRequestBuilder.java | 20 ++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 22 +++++----- .../item/messages/MessagesRequestBuilder.java | 20 ++++----- .../messages/item/MessageRequestBuilder.java | 40 +++++++++--------- .../AttachmentsRequestBuilder.java | 20 ++++----- .../item/AttachmentRequestBuilder.java | 22 +++++----- .../extensions/ExtensionsRequestBuilder.java | 20 ++++----- .../item/ExtensionRequestBuilder.java | 22 +++++----- ...ValueExtendedPropertiesRequestBuilder.java | 20 ++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 22 +++++----- ...ValueExtendedPropertiesRequestBuilder.java | 20 ++++----- ...eLegacyExtendedPropertyRequestBuilder.java | 22 +++++----- .../item/value/ContentRequestBuilder.java | 20 ++++----- msgraph-mail/typescript/src/apiClient.ts | 12 +++--- .../inferenceClassificationRequestBuilder.ts | 26 ++++++------ ...nceClassificationOverrideRequestBuilder.ts | 22 +++++----- .../overrides/overridesRequestBuilder.ts | 20 ++++----- .../childFoldersRequestBuilder.ts | 20 ++++----- .../item/mailFolderRequestBuilder.ts | 22 +++++----- .../item/mailFolderRequestBuilder.ts | 42 +++++++++---------- .../item/messageRuleRequestBuilder.ts | 22 +++++----- .../messageRulesRequestBuilder.ts | 20 ++++----- .../attachments/attachmentsRequestBuilder.ts | 20 ++++----- .../item/attachmentRequestBuilder.ts | 22 +++++----- .../extensions/extensionsRequestBuilder.ts | 20 ++++----- .../item/extensionRequestBuilder.ts | 22 +++++----- .../messages/item/messageRequestBuilder.ts | 40 +++++++++--------- ...lueLegacyExtendedPropertyRequestBuilder.ts | 22 +++++----- ...tiValueExtendedPropertiesRequestBuilder.ts | 20 ++++----- ...lueLegacyExtendedPropertyRequestBuilder.ts | 22 +++++----- ...leValueExtendedPropertiesRequestBuilder.ts | 20 ++++----- .../item/value/contentRequestBuilder.ts | 20 ++++----- .../item/messages/messagesRequestBuilder.ts | 20 ++++----- ...lueLegacyExtendedPropertyRequestBuilder.ts | 22 +++++----- ...tiValueExtendedPropertiesRequestBuilder.ts | 20 ++++----- ...lueLegacyExtendedPropertyRequestBuilder.ts | 22 +++++----- ...leValueExtendedPropertiesRequestBuilder.ts | 20 ++++----- .../mailFolders/mailFoldersRequestBuilder.ts | 20 ++++----- .../attachments/attachmentsRequestBuilder.ts | 20 ++++----- .../item/attachmentRequestBuilder.ts | 22 +++++----- .../extensions/extensionsRequestBuilder.ts | 20 ++++----- .../item/extensionRequestBuilder.ts | 22 +++++----- .../messages/item/messageRequestBuilder.ts | 40 +++++++++--------- ...lueLegacyExtendedPropertyRequestBuilder.ts | 22 +++++----- ...tiValueExtendedPropertiesRequestBuilder.ts | 20 ++++----- ...lueLegacyExtendedPropertyRequestBuilder.ts | 22 +++++----- ...leValueExtendedPropertiesRequestBuilder.ts | 20 ++++----- .../item/value/contentRequestBuilder.ts | 20 ++++----- .../item/messages/messagesRequestBuilder.ts | 20 ++++----- .../src/users/item/userRequestBuilder.ts | 26 ++++++------ .../src/users/usersRequestBuilder.ts | 16 +++---- 114 files changed, 1270 insertions(+), 1270 deletions(-) diff --git a/msgraph-mail/dotnet/ApiClient.cs b/msgraph-mail/dotnet/ApiClient.cs index 010d8c2a3..1e5256621 100644 --- a/msgraph-mail/dotnet/ApiClient.cs +++ b/msgraph-mail/dotnet/ApiClient.cs @@ -9,14 +9,14 @@ namespace Graphdotnetv4 { /// The main entry point of the SDK, exposes the configuration and the fluent API. public class ApiClient { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } public UsersRequestBuilder Users { get => - new UsersRequestBuilder(UrlTemplateParameters, RequestAdapter); + new UsersRequestBuilder(PathParameters, RequestAdapter); } /// /// Instantiates a new ApiClient and sets the default values. @@ -24,7 +24,7 @@ public class ApiClient { /// public ApiClient(IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - UrlTemplateParameters = new Dictionary(); + PathParameters = new Dictionary(); UrlTemplate = "https://graph.microsoft.com/v1.0"; RequestAdapter = requestAdapter; ApiClientBuilder.RegisterDefaultSerializer(); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs index 11d5c56d6..6c356a116 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs @@ -11,25 +11,25 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification public class InferenceClassificationRequestBuilder { public OverridesRequestBuilder Overrides { get => - new OverridesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new OverridesRequestBuilder(PathParameters, RequestAdapter); } + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new InferenceClassificationRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public InferenceClassificationRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public InferenceClassificationRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -43,7 +43,7 @@ public InferenceClassificationRequestBuilder(string rawUrl, IRequestAdapter requ UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -55,7 +55,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -93,7 +93,7 @@ public RequestInformation CreatePatchRequestInformation(Graphdotnetv4.Models.Mic var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs index f19692e1f..f504b9801 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs @@ -9,23 +9,23 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification.Overrides.Item { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification\overrides\{inferenceClassificationOverride-id} public class InferenceClassificationOverrideRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public InferenceClassificationOverrideRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public InferenceClassificationOverrideRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public InferenceClassificationOverrideRequestBuilder(string rawUrl, IRequestAdap UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(InferenceClassificationO var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs index fae80de7c..56390288c 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification.Overrides { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification\overrides public class OverridesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.inferenceClassification.overrides.item collection public InferenceClassificationOverrideRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("inferenceClassificationOverride_id", position); return new InferenceClassificationOverrideRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new OverridesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public OverridesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public OverridesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public OverridesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(InferenceClassificationOv var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs index 0e2029d16..b670e2931 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.ChildFolders { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\childFolders public class ChildFoldersRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.childFolders.item collection public MailFolderRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("mailFolder_id1", position); return new MailFolderRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new ChildFoldersRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ChildFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ChildFoldersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public ChildFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(MailFolder body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\childFolders\{mailFolder-id1} public class MailFolderRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MailFolderRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MailFolderRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(MailFolder body, Action< var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs index 0ae0b6cea..c2d7e1773 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs @@ -15,37 +15,37 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id} public class MailFolderRequestBuilder { public ChildFoldersRequestBuilder ChildFolders { get => - new ChildFoldersRequestBuilder(UrlTemplateParameters, RequestAdapter); + new ChildFoldersRequestBuilder(PathParameters, RequestAdapter); } public MessageRulesRequestBuilder MessageRules { get => - new MessageRulesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MessageRulesRequestBuilder(PathParameters, RequestAdapter); } public MessagesRequestBuilder Messages { get => - new MessagesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MessagesRequestBuilder(PathParameters, RequestAdapter); } public MultiValueExtendedPropertiesRequestBuilder MultiValueExtendedProperties { get => - new MultiValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MultiValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => - new SingleValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new SingleValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MailFolderRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MailFolderRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MailFolderRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -71,7 +71,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -109,7 +109,7 @@ public RequestInformation CreatePatchRequestInformation(MailFolder body, Action< var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs index 1713da772..8a31e5bf2 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs @@ -9,23 +9,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MessageRules.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messageRules\{messageRule-id} public class MessageRuleRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRuleRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessageRuleRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessageRuleRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public MessageRuleRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(MessageRule body, Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs index 207ddbf76..cd263bb7d 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MessageRules { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messageRules public class MessageRulesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messageRules.item collection public MessageRuleRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("messageRule_id", position); return new MessageRuleRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MessageRulesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessageRulesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessageRulesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MessageRulesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(MessageRule body, Action< var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs index bd6a148a7..eb42b5308 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Attachments { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\attachments public class AttachmentsRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.attachments.item collection public AttachmentRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("attachment_id", position); return new AttachmentRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new AttachmentsRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public AttachmentsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public AttachmentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(Attachment body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\attachments\{attachment-id} public class AttachmentRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new AttachmentRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public AttachmentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public AttachmentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public AttachmentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(Attachment body, Action< var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index df50d789b..9beee3c6e 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Extensions { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\extensions public class ExtensionsRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.extensions.item collection public ExtensionRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("extension_id", position); return new ExtensionRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new ExtensionsRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ExtensionsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public ExtensionsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\extensions\{extension-id} public class ExtensionRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ExtensionRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ExtensionRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ExtensionRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public ExtensionRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id} public class MessageRequestBuilder { public AttachmentsRequestBuilder Attachments { get => - new AttachmentsRequestBuilder(UrlTemplateParameters, RequestAdapter); + new AttachmentsRequestBuilder(PathParameters, RequestAdapter); } public ContentRequestBuilder Content { get => - new ContentRequestBuilder(UrlTemplateParameters, RequestAdapter); + new ContentRequestBuilder(PathParameters, RequestAdapter); } public ExtensionsRequestBuilder Extensions { get => - new ExtensionsRequestBuilder(UrlTemplateParameters, RequestAdapter); + new ExtensionsRequestBuilder(PathParameters, RequestAdapter); } public MultiValueExtendedPropertiesRequestBuilder MultiValueExtendedProperties { get => - new MultiValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MultiValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => - new SingleValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new SingleValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessageRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -71,7 +71,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -109,7 +109,7 @@ public RequestInformation CreatePatchRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAda UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(MultiValueLegacyExtended var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 54c55c074..e249c70a9 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(MultiValueLegacyExtendedP var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 241d2ee9b..6b3efc093 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -9,23 +9,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.SingleValueExtendedProperties.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAd UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(SingleValueLegacyExtende var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index b5cf2894f..3bfdadfa9 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public SingleValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapte UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(SingleValueLegacyExtended var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs index 1a4acb8fe..a98d888b2 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -8,23 +8,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Value { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\$value public class ContentRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ContentRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ContentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ContentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -38,7 +38,7 @@ public ContentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -50,7 +50,7 @@ public RequestInformation CreateGetRequestInformation(ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages public class MessagesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item collection public MessageRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("message_id", position); return new MessageRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MessagesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessagesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessagesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MessagesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAda UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(MultiValueLegacyExtended var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 4bf2f27b3..5f07e6216 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(MultiValueLegacyExtendedP var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 9e9bf75e6..ddf7666bf 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -9,23 +9,23 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.SingleValueExtendedProperties.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAd UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(SingleValueLegacyExtende var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index eb978bc97..c3c6d0ac8 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public SingleValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapte UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(SingleValueLegacyExtended var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs index 5057fcca2..cb2004dd8 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.MailFolders { /// Builds and executes requests for operations under \users\{user-id}\mailFolders public class MailFoldersRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item collection public MailFolderRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("mailFolder_id", position); return new MailFolderRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MailFoldersRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MailFoldersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MailFoldersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MailFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(MailFolder body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\attachments public class AttachmentsRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.attachments.item collection public AttachmentRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("attachment_id", position); return new AttachmentRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new AttachmentsRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public AttachmentsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public AttachmentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(Attachment body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\attachments\{attachment-id} public class AttachmentRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new AttachmentRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public AttachmentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public AttachmentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public AttachmentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(Attachment body, Action< var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index d8e634bc2..ecaa18eb0 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Extensions { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\extensions public class ExtensionsRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.extensions.item collection public ExtensionRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("extension_id", position); return new ExtensionRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new ExtensionsRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ExtensionsRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public ExtensionsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\extensions\{extension-id} public class ExtensionRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ExtensionRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ExtensionRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ExtensionRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public ExtensionRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(Extension body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id} public class MessageRequestBuilder { public AttachmentsRequestBuilder Attachments { get => - new AttachmentsRequestBuilder(UrlTemplateParameters, RequestAdapter); + new AttachmentsRequestBuilder(PathParameters, RequestAdapter); } public ContentRequestBuilder Content { get => - new ContentRequestBuilder(UrlTemplateParameters, RequestAdapter); + new ContentRequestBuilder(PathParameters, RequestAdapter); } public ExtensionsRequestBuilder Extensions { get => - new ExtensionsRequestBuilder(UrlTemplateParameters, RequestAdapter); + new ExtensionsRequestBuilder(PathParameters, RequestAdapter); } public MultiValueExtendedPropertiesRequestBuilder MultiValueExtendedProperties { get => - new MultiValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MultiValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => - new SingleValueExtendedPropertiesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new SingleValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MessageRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessageRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessageRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -71,7 +71,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -109,7 +109,7 @@ public RequestInformation CreatePatchRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id}\messages\{message-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAda UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(MultiValueLegacyExtended var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 8bf90dccf..d4f8cef76 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(MultiValueLegacyExtendedP var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 7c627bd88..e5100597f 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -9,23 +9,23 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.SingleValueExtendedProperties.Item { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -39,7 +39,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAd UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -51,7 +51,7 @@ public RequestInformation CreateDeleteRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -89,7 +89,7 @@ public RequestInformation CreatePatchRequestInformation(SingleValueLegacyExtende var requestInfo = new RequestInformation { HttpMethod = HttpMethod.PATCH, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 10e6e6cf6..26e7052a3 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -10,29 +10,29 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public SingleValueExtendedPropertiesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapte UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(SingleValueLegacyExtended var requestInfo = new RequestInformation { HttpMethod = HttpMethod.POST, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body); h?.Invoke(requestInfo.Headers); diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs index e786724d6..43c80a4a2 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -8,23 +8,23 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Value { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\$value public class ContentRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new ContentRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public ContentRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public ContentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -38,7 +38,7 @@ public ContentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -50,7 +50,7 @@ public RequestInformation CreateGetRequestInformation(ActionBuilds and executes requests for operations under \users\{user-id}\messages public class MessagesRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item collection public MessageRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("message_id", position); return new MessageRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new MessagesRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public MessagesRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public MessagesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -46,7 +46,7 @@ public MessagesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -59,7 +59,7 @@ public RequestInformation CreateGetRequestInformation(Action var requestInfo = new RequestInformation { HttpMethod = HttpMethod.GET, UrlTemplate = UrlTemplate, - UrlTemplateParameters = UrlTemplateParameters, + PathParameters = PathParameters, }; if (q != null) { var qParams = new GetQueryParameters(); @@ -81,7 +81,7 @@ public RequestInformation CreatePostRequestInformation(Message body, ActionBuilds and executes requests for operations under \users\{user-id} public class UserRequestBuilder { public InferenceClassificationRequestBuilder InferenceClassification { get => - new InferenceClassificationRequestBuilder(UrlTemplateParameters, RequestAdapter); + new InferenceClassificationRequestBuilder(PathParameters, RequestAdapter); } public MailFoldersRequestBuilder MailFolders { get => - new MailFoldersRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MailFoldersRequestBuilder(PathParameters, RequestAdapter); } public MessagesRequestBuilder Messages { get => - new MessagesRequestBuilder(UrlTemplateParameters, RequestAdapter); + new MessagesRequestBuilder(PathParameters, RequestAdapter); } + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// /// Instantiates a new UserRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public UserRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public UserRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -49,7 +49,7 @@ public UserRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } } diff --git a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs index 91acbe83e..a1b3a1a98 100644 --- a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs @@ -8,29 +8,29 @@ namespace Graphdotnetv4.Users { /// Builds and executes requests for operations under \users public class UsersRequestBuilder { + /// Path parameters for the request + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } - /// Url template parameters for the request - private Dictionary UrlTemplateParameters { get; set; } /// Gets an item from the Graphdotnetv4.users.item collection public UserRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(UrlTemplateParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("user_id", position); return new UserRequestBuilder(urlTplParams, RequestAdapter); } } /// /// Instantiates a new UsersRequestBuilder and sets the default values. + /// Path parameters for the request /// The request adapter to use to execute the requests. - /// Url template parameters for the request /// - public UsersRequestBuilder(Dictionary urlTemplateParameters, IRequestAdapter requestAdapter) { + public UsersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - _ = urlTemplateParameters ?? throw new ArgumentNullException(nameof(urlTemplateParameters)); UrlTemplate = "https://graph.microsoft.com/v1.0/users"; - var urlTplParams = new Dictionary(urlTemplateParameters); - UrlTemplateParameters = urlTplParams; + var urlTplParams = new Dictionary(pathParameters); + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } /// @@ -44,7 +44,7 @@ public UsersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { UrlTemplate = "https://graph.microsoft.com/v1.0/users"; var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); - UrlTemplateParameters = urlTplParams; + PathParameters = urlTplParams; RequestAdapter = requestAdapter; } } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java index 9d5269659..f5f25b19f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java @@ -12,15 +12,15 @@ import java.util.Objects; /** The main entry point of the SDK, exposes the configuration and the fluent API. */ public class ApiClient { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; @javax.annotation.Nonnull public UsersRequestBuilder users() { - return new UsersRequestBuilder(urlTemplateParameters, requestAdapter); + return new UsersRequestBuilder(pathParameters, requestAdapter); } /** * Instantiates a new ApiClient and sets the default values. @@ -29,8 +29,8 @@ public UsersRequestBuilder users() { */ public ApiClient(@javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(requestAdapter); + this.pathParameters = new HashMap<>(); this.urlTemplate = "https://graph.microsoft.com/v1.0"; - this.urlTemplateParameters = new HashMap<>(); this.requestAdapter = requestAdapter; ApiClientBuilder.registerDefaultSerializer(JsonSerializationWriterFactory.class); ApiClientBuilder.registerDefaultDeserializer(JsonParseNodeFactory.class); @@ -43,7 +43,7 @@ public ApiClient(@javax.annotation.Nonnull final RequestAdapter requestAdapter) @javax.annotation.Nonnull public UserRequestBuilder users(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("user_id", id); return new UserRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java index 406b90e28..ea96137fe 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java @@ -5,24 +5,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users */ public class UsersRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new UsersRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -35,7 +35,7 @@ public UsersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java index 5b50eac43..ac53f63ee 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java @@ -12,34 +12,34 @@ public class UserRequestBuilder { @javax.annotation.Nonnull public InferenceClassificationRequestBuilder inferenceClassification() { - return new InferenceClassificationRequestBuilder(urlTemplateParameters, requestAdapter); + return new InferenceClassificationRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MailFoldersRequestBuilder mailFolders() { - return new MailFoldersRequestBuilder(urlTemplateParameters, requestAdapter); + return new MailFoldersRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MessagesRequestBuilder messages() { - return new MessagesRequestBuilder(urlTemplateParameters, requestAdapter); + return new MessagesRequestBuilder(pathParameters, requestAdapter); } + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new UserRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public UserRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public UserRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -52,7 +52,7 @@ public UserRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax. this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -63,7 +63,7 @@ public UserRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax. @javax.annotation.Nonnull public MailFolderRequestBuilder mailFolders(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("mailFolder_id", id); return new MailFolderRequestBuilder(urlTplParams, requestAdapter); } @@ -75,7 +75,7 @@ public MailFolderRequestBuilder mailFolders(@javax.annotation.Nonnull final Stri @javax.annotation.Nonnull public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("message_id", id); return new MessageRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java index 6e5a9e981..49ed9be83 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java @@ -19,26 +19,26 @@ public class InferenceClassificationRequestBuilder { @javax.annotation.Nonnull public OverridesRequestBuilder overrides() { - return new OverridesRequestBuilder(urlTemplateParameters, requestAdapter); + return new OverridesRequestBuilder(pathParameters, requestAdapter); } + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -51,7 +51,7 @@ public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final Str this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -83,7 +83,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -132,7 +132,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -179,7 +179,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -321,7 +321,7 @@ public java.util.concurrent.CompletableFuture get(@java @javax.annotation.Nonnull public InferenceClassificationOverrideRequestBuilder overrides(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("inferenceClassificationOverride_id", id); return new InferenceClassificationOverrideRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java index d97cf79ea..2064f07e3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ public class OverridesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new OverridesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public OverridesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @j this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java index bf09cc1aa..cb78f6cbe 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ public class InferenceClassificationOverrideRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull f this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java index b854fb185..9bfd56e2f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ public class MailFoldersRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MailFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java index c772b480f..c8519b530 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java @@ -26,30 +26,30 @@ public class MailFolderRequestBuilder { @javax.annotation.Nonnull public ChildFoldersRequestBuilder childFolders() { - return new ChildFoldersRequestBuilder(urlTemplateParameters, requestAdapter); + return new ChildFoldersRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MessageRulesRequestBuilder messageRules() { - return new MessageRulesRequestBuilder(urlTemplateParameters, requestAdapter); + return new MessageRulesRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MessagesRequestBuilder messages() { - return new MessagesRequestBuilder(urlTemplateParameters, requestAdapter); + return new MessagesRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() { - return new MultiValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); + return new MultiValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties() { - return new SingleValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); + return new SingleValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item.childFolders.item collection * @param id Unique identifier of the item @@ -58,22 +58,22 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public MailFolderRequestBuilder childFolders(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("mailFolder_id1", id); return new MailFolderRequestBuilder(urlTplParams, requestAdapter); } /** * Instantiates a new MailFolderRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -86,7 +86,7 @@ public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -118,7 +118,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -167,7 +167,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -214,7 +214,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -356,7 +356,7 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation. @javax.annotation.Nonnull public MessageRuleRequestBuilder messageRules(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("messageRule_id", id); return new MessageRuleRequestBuilder(urlTplParams, requestAdapter); } @@ -368,7 +368,7 @@ public MessageRuleRequestBuilder messageRules(@javax.annotation.Nonnull final St @javax.annotation.Nonnull public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("message_id", id); return new MessageRequestBuilder(urlTplParams, requestAdapter); } @@ -380,7 +380,7 @@ public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } @@ -451,7 +451,7 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java index afb3f5344..05c537817 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ public class ChildFoldersRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final String rawUrl, this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java index 69459f709..e056ed65e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ public class MailFolderRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MailFolderRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java index ad3d08101..e33ed870b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ public class MessageRulesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MessageRulesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java index 6743c9c61..19e1e73c7 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ public class MessageRuleRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MessageRuleRequestBuilder(@javax.annotation.Nonnull final String rawUrl, this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java index 1f260bad5..c17962a36 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ public class MessagesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MessagesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ja this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java index 1bdf51bfe..1d3a51d04 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java @@ -26,30 +26,30 @@ public class MessageRequestBuilder { @javax.annotation.Nonnull public AttachmentsRequestBuilder attachments() { - return new AttachmentsRequestBuilder(urlTemplateParameters, requestAdapter); + return new AttachmentsRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public ContentRequestBuilder content() { - return new ContentRequestBuilder(urlTemplateParameters, requestAdapter); + return new ContentRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public ExtensionsRequestBuilder extensions() { - return new ExtensionsRequestBuilder(urlTemplateParameters, requestAdapter); + return new ExtensionsRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() { - return new MultiValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); + return new MultiValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties() { - return new SingleValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); + return new SingleValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Gets an item from the graphjavav4.utilities.users.item.mailFolders.item.messages.item.attachments.item collection * @param id Unique identifier of the item @@ -58,22 +58,22 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, requestAdapter); } /** * Instantiates a new MessageRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -86,7 +86,7 @@ public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @jav this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -118,7 +118,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -167,7 +167,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -214,7 +214,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -286,7 +286,7 @@ public java.util.concurrent.CompletableFuture delete(@javax.annotation.Nul @javax.annotation.Nonnull public ExtensionRequestBuilder extensions(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, requestAdapter); } @@ -368,7 +368,7 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation.Nul @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } @@ -439,7 +439,7 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java index 264c028bf..2797630c6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ public class AttachmentsRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java index d5f19c8c7..7f34ba31e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ public class AttachmentRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java index 1a92babe4..5df584b6a 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ public class ExtensionsRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java index 26082e24b..17c8e02d9 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ public class ExtensionRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @j this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index cb8f0bb68..ca2d137df 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fina this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index d9077d2cf..57ea61c6f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index fdff6ec3d..7b738260f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fin this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index 90a10a89b..b89ad411b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java index 79d15cb0a..b972b9e50 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java @@ -14,24 +14,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ public class ContentRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ContentRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -44,7 +44,7 @@ public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @jav this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -76,7 +76,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -118,7 +118,7 @@ public RequestInformation createPutRequestInformation(final InputStream body, @j httpMethod = HttpMethod.PUT; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setStreamContent(body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index 3b4594e78..7007973c1 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fina this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 1073a66ac..b5373cc03 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 239dfa9a5..cf2140e8b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fin this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index d439fbe25..7bbc3a131 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java index fa543583d..defa28dc9 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages */ public class MessagesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MessagesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MessagesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ja this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java index cabe63c2b..f827be55b 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java @@ -26,30 +26,30 @@ public class MessageRequestBuilder { @javax.annotation.Nonnull public AttachmentsRequestBuilder attachments() { - return new AttachmentsRequestBuilder(urlTemplateParameters, requestAdapter); + return new AttachmentsRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public ContentRequestBuilder content() { - return new ContentRequestBuilder(urlTemplateParameters, requestAdapter); + return new ContentRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public ExtensionsRequestBuilder extensions() { - return new ExtensionsRequestBuilder(urlTemplateParameters, requestAdapter); + return new ExtensionsRequestBuilder(pathParameters, requestAdapter); } @javax.annotation.Nonnull public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() { - return new MultiValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); + return new MultiValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties() { - return new SingleValueExtendedPropertiesRequestBuilder(urlTemplateParameters, requestAdapter); + return new SingleValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Gets an item from the graphjavav4.utilities.users.item.messages.item.attachments.item collection * @param id Unique identifier of the item @@ -58,22 +58,22 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, requestAdapter); } /** * Instantiates a new MessageRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -86,7 +86,7 @@ public MessageRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @jav this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -118,7 +118,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -167,7 +167,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -214,7 +214,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); @@ -286,7 +286,7 @@ public java.util.concurrent.CompletableFuture delete(@javax.annotation.Nul @javax.annotation.Nonnull public ExtensionRequestBuilder extensions(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, requestAdapter); } @@ -368,7 +368,7 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation.Nul @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } @@ -439,7 +439,7 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.urlTemplateParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java index 5892b6df5..9daed74db 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ public class AttachmentsRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public AttachmentsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java index d0191149b..ec4a39da0 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ public class AttachmentRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public AttachmentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java index ca5450efd..c16effccb 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ public class ExtensionsRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public ExtensionsRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @ this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java index 7237933f9..fdf56924e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ public class ExtensionRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public ExtensionRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @j this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index 043a759f6..df1e81ac3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fina this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 98409c240..94ff4012e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 452014e7d..6509d240c 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fin this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -88,7 +88,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -135,7 +135,7 @@ public RequestInformation createPostRequestInformation(@javax.annotation.Nonnull httpMethod = HttpMethod.POST; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index f26d50a23..ecea7b9e3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -15,24 +15,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -45,7 +45,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -77,7 +77,7 @@ public RequestInformation createDeleteRequestInformation(@javax.annotation.Nulla httpMethod = HttpMethod.DELETE; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -126,7 +126,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (q != null) { final GetQueryParameters qParams = new GetQueryParameters(); q.accept(qParams); @@ -173,7 +173,7 @@ public RequestInformation createPatchRequestInformation(@javax.annotation.Nonnul httpMethod = HttpMethod.PATCH; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setContentFromParsable(requestAdapter, "application/json", body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java index 17adb2af7..208c6e0c6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java @@ -14,24 +14,24 @@ import java.util.Objects; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ public class ContentRequestBuilder { + /** Path parameters for the request */ + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ private final String urlTemplate; - /** Url template parameters for the request */ - private final HashMap urlTemplateParameters; /** * Instantiates a new ContentRequestBuilder and sets the default values. + * @param pathParameters Path parameters for the request * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters Url template parameters for the request * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap urlTemplateParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); - Objects.requireNonNull(urlTemplateParameters); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + var urlTplParams = new HashMap(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -44,7 +44,7 @@ public ContentRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @jav this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); - this.urlTemplateParameters = urlTplParams; + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } /** @@ -76,7 +76,7 @@ public RequestInformation createGetRequestInformation(@javax.annotation.Nullable httpMethod = HttpMethod.GET; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; if (h != null) { h.accept(requestInfo.headers); } @@ -118,7 +118,7 @@ public RequestInformation createPutRequestInformation(final InputStream body, @j httpMethod = HttpMethod.PUT; }}; requestInfo.urlTemplate = urlTemplate; - requestInfo.urlTemplateParameters = urlTemplateParameters; + requestInfo.pathParameters = pathParameters; requestInfo.setStreamContent(body); if (h != null) { h.accept(requestInfo.headers); diff --git a/msgraph-mail/typescript/src/apiClient.ts b/msgraph-mail/typescript/src/apiClient.ts index abf98ba55..478030e68 100644 --- a/msgraph-mail/typescript/src/apiClient.ts +++ b/msgraph-mail/typescript/src/apiClient.ts @@ -1,18 +1,18 @@ import {UserRequestBuilder} from './users/item/userRequestBuilder'; import {UsersRequestBuilder} from './users/usersRequestBuilder'; -import {enableBackingStoreForSerializationWriterFactory, getUrlTemplateParameters, ParseNodeFactoryRegistry, registerDefaultDeserializer, registerDefaultSerializer, RequestAdapter, SerializationWriterFactoryRegistry} from '@microsoft/kiota-abstractions'; +import {enableBackingStoreForSerializationWriterFactory, getPathParameters, ParseNodeFactoryRegistry, registerDefaultDeserializer, registerDefaultSerializer, RequestAdapter, SerializationWriterFactoryRegistry} from '@microsoft/kiota-abstractions'; import {JsonParseNodeFactory, JsonSerializationWriterFactory} from '@microsoft/kiota-serialization-json'; /** The main entry point of the SDK, exposes the configuration and the fluent API. */ export class ApiClient { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; public get users(): UsersRequestBuilder { - return new UsersRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new UsersRequestBuilder(this.pathParameters, this.requestAdapter); } /** * Instantiates a new ApiClient and sets the default values. @@ -20,7 +20,7 @@ export class ApiClient { */ public constructor(requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.urlTemplateParameters = new Map(); + this.pathParameters = new Map(); this.urlTemplate = "https://graph.microsoft.com/v1.0"; this.requestAdapter = requestAdapter; registerDefaultSerializer(JsonSerializationWriterFactory); @@ -33,7 +33,7 @@ export class ApiClient { */ public usersById(id: string) : UserRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("user_id", id); return new UserRequestBuilder(urlTplParams, this.requestAdapter); }; diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts index 8499a2825..180ea0549 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts @@ -1,30 +1,30 @@ import {InferenceClassification} from '../../../models/microsoft/graph/inferenceClassification'; import {InferenceClassificationOverrideRequestBuilder} from './overrides/item/inferenceClassificationOverrideRequestBuilder'; import {OverridesRequestBuilder} from './overrides/overridesRequestBuilder'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification */ export class InferenceClassificationRequestBuilder { public get overrides(): OverridesRequestBuilder { - return new OverridesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new OverridesRequestBuilder(this.pathParameters, this.requestAdapter); } + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new InferenceClassificationRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -36,7 +36,7 @@ export class InferenceClassificationRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -55,7 +55,7 @@ export class InferenceClassificationRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -73,7 +73,7 @@ export class InferenceClassificationRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -116,7 +116,7 @@ export class InferenceClassificationRequestBuilder { */ public overridesById(id: string) : InferenceClassificationOverrideRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("inferenceClassificationOverride_id", id); return new InferenceClassificationOverrideRequestBuilder(urlTplParams, this.requestAdapter); }; diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts index 67f16f188..b90f048bd 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts @@ -1,25 +1,25 @@ import {InferenceClassificationOverride} from '../../../../../models/microsoft/graph/inferenceClassificationOverride'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ export class InferenceClassificationOverrideRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class InferenceClassificationOverrideRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class InferenceClassificationOverrideRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class InferenceClassificationOverrideRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts index 85a5fec24..302cae56a 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts @@ -1,26 +1,26 @@ import {InferenceClassificationOverride} from '../../../../models/microsoft/graph/inferenceClassificationOverride'; import {OverridesResponse} from './overridesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ export class OverridesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new OverridesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class OverridesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class OverridesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts index 3c17ecd57..3d2328235 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts @@ -1,26 +1,26 @@ import {MailFolder} from '../../../../../models/microsoft/graph/mailFolder'; import {ChildFoldersResponse} from './childFoldersResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ export class ChildFoldersRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ChildFoldersRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class ChildFoldersRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class ChildFoldersRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts index 59d07c908..4c2cc9a99 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts @@ -1,25 +1,25 @@ import {MailFolder} from '../../../../../../models/microsoft/graph/mailFolder'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ export class MailFolderRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class MailFolderRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class MailFolderRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class MailFolderRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts index 45f8161dc..7ef1608ee 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts @@ -9,31 +9,31 @@ import {MultiValueLegacyExtendedPropertyRequestBuilder} from './multiValueExtend import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder'; import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id} */ export class MailFolderRequestBuilder { public get childFolders(): ChildFoldersRequestBuilder { - return new ChildFoldersRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new ChildFoldersRequestBuilder(this.pathParameters, this.requestAdapter); } public get messageRules(): MessageRulesRequestBuilder { - return new MessageRulesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MessageRulesRequestBuilder(this.pathParameters, this.requestAdapter); } public get messages(): MessagesRequestBuilder { - return new MessagesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MessagesRequestBuilder(this.pathParameters, this.requestAdapter); } public get multiValueExtendedProperties(): MultiValueExtendedPropertiesRequestBuilder { - return new MultiValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MultiValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { - return new SingleValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new SingleValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item.childFolders.item collection * @param id Unique identifier of the item @@ -41,21 +41,21 @@ export class MailFolderRequestBuilder { */ public childFoldersById(id: string) : i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8 { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("mailFolder_id1", id); return new i875c8b38b2223dfa60b331a74c956886fff55439eff296aff4c44c12143b38a8(urlTplParams, this.requestAdapter); }; /** * Instantiates a new MailFolderRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -67,7 +67,7 @@ export class MailFolderRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -86,7 +86,7 @@ export class MailFolderRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -104,7 +104,7 @@ export class MailFolderRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -147,7 +147,7 @@ export class MailFolderRequestBuilder { */ public messageRulesById(id: string) : MessageRuleRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("messageRule_id", id); return new MessageRuleRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -158,7 +158,7 @@ export class MailFolderRequestBuilder { */ public messagesById(id: string) : MessageRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("message_id", id); return new MessageRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -169,7 +169,7 @@ export class MailFolderRequestBuilder { */ public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -194,7 +194,7 @@ export class MailFolderRequestBuilder { */ public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts index 936ba4892..159e4edc1 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts @@ -1,25 +1,25 @@ import {MessageRule} from '../../../../../../models/microsoft/graph/messageRule'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ export class MessageRuleRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MessageRuleRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class MessageRuleRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class MessageRuleRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class MessageRuleRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts index 4a04826e3..191480d1c 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts @@ -1,26 +1,26 @@ import {MessageRule} from '../../../../../models/microsoft/graph/messageRule'; import {MessageRulesResponse} from './messageRulesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ export class MessageRulesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MessageRulesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MessageRulesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MessageRulesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts index 1bca045bf..17229c2fc 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -1,26 +1,26 @@ import {Attachment} from '../../../../../../../models/microsoft/graph/attachment'; import {AttachmentsResponse} from './attachmentsResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class AttachmentsRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class AttachmentsRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts index 86a51474c..c2e17b3e3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -1,25 +1,25 @@ import {Attachment} from '../../../../../../../../models/microsoft/graph/attachment'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class AttachmentRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class AttachmentRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class AttachmentRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts index 74b72c30c..2471d5209 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -1,26 +1,26 @@ import {Extension} from '../../../../../../../models/microsoft/graph/extension'; import {ExtensionsResponse} from './extensionsResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class ExtensionsRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class ExtensionsRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts index 1a01f2dba..cf9a0040d 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -1,25 +1,25 @@ import {Extension} from '../../../../../../../../models/microsoft/graph/extension'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class ExtensionRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class ExtensionRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class ExtensionRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts index 14b24b8a1..9fd766fbc 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts @@ -8,31 +8,31 @@ import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedPr import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; import {ContentRequestBuilder} from './value/contentRequestBuilder'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id} */ export class MessageRequestBuilder { public get attachments(): AttachmentsRequestBuilder { - return new AttachmentsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new AttachmentsRequestBuilder(this.pathParameters, this.requestAdapter); } public get content(): ContentRequestBuilder { - return new ContentRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new ContentRequestBuilder(this.pathParameters, this.requestAdapter); } public get extensions(): ExtensionsRequestBuilder { - return new ExtensionsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new ExtensionsRequestBuilder(this.pathParameters, this.requestAdapter); } public get multiValueExtendedProperties(): MultiValueExtendedPropertiesRequestBuilder { - return new MultiValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MultiValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { - return new SingleValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new SingleValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Gets an item from the graphtypescriptv4.utilities.users.item.mailFolders.item.messages.item.attachments.item collection * @param id Unique identifier of the item @@ -40,21 +40,21 @@ export class MessageRequestBuilder { */ public attachmentsById(id: string) : AttachmentRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Instantiates a new MessageRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -66,7 +66,7 @@ export class MessageRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -85,7 +85,7 @@ export class MessageRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -103,7 +103,7 @@ export class MessageRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -129,7 +129,7 @@ export class MessageRequestBuilder { */ public extensionsById(id: string) : ExtensionRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -157,7 +157,7 @@ export class MessageRequestBuilder { */ public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -182,7 +182,7 @@ export class MessageRequestBuilder { */ public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 0ff2ed863..6750cdd44 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,25 +1,25 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index ba8de2208..182629f2c 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,26 +1,26 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index ec151e550..e76bc1b31 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,25 +1,25 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index c9ab717bb..30c6f8712 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,26 +1,26 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts index 434fd39a2..d94b7e0d6 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts @@ -1,25 +1,25 @@ -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ export class ContentRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ContentRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class ContentRequestBuilder { public createGetRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -48,7 +48,7 @@ export class ContentRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PUT; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setStreamContent(body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts index fe0a5910b..b8b5f3535 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts @@ -1,26 +1,26 @@ import {Message} from '../../../../../models/microsoft/graph/message'; import {MessagesResponse} from './messagesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ export class MessagesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MessagesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MessagesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MessagesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 6f739d773..29feb3e9b 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,25 +1,25 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index 107308e76..b92340915 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,26 +1,26 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index ab20ab871..588a7893c 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,25 +1,25 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 80136e02e..f64db1780 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,26 +1,26 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts index a2e651a20..96d0202c3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts @@ -1,26 +1,26 @@ import {MailFolder} from '../../../models/microsoft/graph/mailFolder'; import {MailFoldersResponse} from './mailFoldersResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ export class MailFoldersRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MailFoldersRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MailFoldersRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MailFoldersRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts index 019d85079..a89a477db 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -1,26 +1,26 @@ import {Attachment} from '../../../../../models/microsoft/graph/attachment'; import {AttachmentsResponse} from './attachmentsResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentsRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class AttachmentsRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class AttachmentsRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts index c79a414d6..c9ebb85f1 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -1,25 +1,25 @@ import {Attachment} from '../../../../../../models/microsoft/graph/attachment'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new AttachmentRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class AttachmentRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class AttachmentRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class AttachmentRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts index af273b03b..63928c4b0 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -1,26 +1,26 @@ import {Extension} from '../../../../../models/microsoft/graph/extension'; import {ExtensionsResponse} from './extensionsResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionsRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class ExtensionsRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class ExtensionsRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts index 14d8bcd63..6351cdb72 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -1,25 +1,25 @@ import {Extension} from '../../../../../../models/microsoft/graph/extension'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ExtensionRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class ExtensionRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class ExtensionRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class ExtensionRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts index cba458659..0f16c2627 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts @@ -8,31 +8,31 @@ import {MultiValueExtendedPropertiesRequestBuilder} from './multiValueExtendedPr import {SingleValueLegacyExtendedPropertyRequestBuilder} from './singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder'; import {SingleValueExtendedPropertiesRequestBuilder} from './singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder'; import {ContentRequestBuilder} from './value/contentRequestBuilder'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id} */ export class MessageRequestBuilder { public get attachments(): AttachmentsRequestBuilder { - return new AttachmentsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new AttachmentsRequestBuilder(this.pathParameters, this.requestAdapter); } public get content(): ContentRequestBuilder { - return new ContentRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new ContentRequestBuilder(this.pathParameters, this.requestAdapter); } public get extensions(): ExtensionsRequestBuilder { - return new ExtensionsRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new ExtensionsRequestBuilder(this.pathParameters, this.requestAdapter); } public get multiValueExtendedProperties(): MultiValueExtendedPropertiesRequestBuilder { - return new MultiValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MultiValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { - return new SingleValueExtendedPropertiesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new SingleValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Gets an item from the graphtypescriptv4.utilities.users.item.messages.item.attachments.item collection * @param id Unique identifier of the item @@ -40,21 +40,21 @@ export class MessageRequestBuilder { */ public attachmentsById(id: string) : AttachmentRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, this.requestAdapter); }; /** * Instantiates a new MessageRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -66,7 +66,7 @@ export class MessageRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -85,7 +85,7 @@ export class MessageRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -103,7 +103,7 @@ export class MessageRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); @@ -129,7 +129,7 @@ export class MessageRequestBuilder { */ public extensionsById(id: string) : ExtensionRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -157,7 +157,7 @@ export class MessageRequestBuilder { */ public multiValueExtendedPropertiesById(id: string) : MultiValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -182,7 +182,7 @@ export class MessageRequestBuilder { */ public singleValueExtendedPropertiesById(id: string) : SingleValueLegacyExtendedPropertyRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, this.requestAdapter); }; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 61f041d8a..e528ee407 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,25 +1,25 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index e87392cf1..45df0a84c 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -1,26 +1,26 @@ import {MultiValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/multiValueLegacyExtendedProperty'; import {MultiValueExtendedPropertiesResponse} from './multiValueExtendedPropertiesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index e30bea53e..8a7914158 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -1,25 +1,25 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { public createDeleteRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.DELETE; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -50,7 +50,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -68,7 +68,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PATCH; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 6136148db..bc59e988a 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -1,26 +1,26 @@ import {SingleValueLegacyExtendedProperty} from '../../../../../models/microsoft/graph/singleValueLegacyExtendedProperty'; import {SingleValueExtendedPropertiesResponse} from './singleValueExtendedPropertiesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts index 16c9d72a9..2dc7cfd61 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts @@ -1,25 +1,25 @@ -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ export class ContentRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new ContentRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -31,7 +31,7 @@ export class ContentRequestBuilder { public createGetRequestInformation(h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); o && requestInfo.addRequestOptions(...o); @@ -48,7 +48,7 @@ export class ContentRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.PUT; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setStreamContent(body); diff --git a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts index e13104a29..e3e91e2f8 100644 --- a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts @@ -1,26 +1,26 @@ import {Message} from '../../../models/microsoft/graph/message'; import {MessagesResponse} from './messagesResponse'; -import {getUrlTemplateParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; +import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformation, RequestOption, ResponseHandler} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id}/messages */ export class MessagesRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new MessagesRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class MessagesRequestBuilder { } | undefined, h?: object | undefined, o?: RequestOption[] | undefined) : RequestInformation { const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.GET; h && requestInfo.setHeadersFromRawObject(h); q && requestInfo.setQueryStringParametersFromRawObject(q); @@ -60,7 +60,7 @@ export class MessagesRequestBuilder { if(!body) throw new Error("body cannot be undefined"); const requestInfo = new RequestInformation(); requestInfo.urlTemplate = this.urlTemplate; - requestInfo.urlTemplateParameters = this.urlTemplateParameters; + requestInfo.pathParameters = this.pathParameters; requestInfo.httpMethod = HttpMethod.POST; h && requestInfo.setHeadersFromRawObject(h); requestInfo.setContentFromParsable(this.requestAdapter, "application/json", body); diff --git a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts index ae2d5a968..b8df0b067 100644 --- a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts @@ -3,36 +3,36 @@ import {MailFolderRequestBuilder} from './mailFolders/item/mailFolderRequestBuil import {MailFoldersRequestBuilder} from './mailFolders/mailFoldersRequestBuilder'; import {MessageRequestBuilder} from './messages/item/messageRequestBuilder'; import {MessagesRequestBuilder} from './messages/messagesRequestBuilder'; -import {getUrlTemplateParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {getPathParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users/{user-id} */ export class UserRequestBuilder { public get inferenceClassification(): InferenceClassificationRequestBuilder { - return new InferenceClassificationRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new InferenceClassificationRequestBuilder(this.pathParameters, this.requestAdapter); } public get mailFolders(): MailFoldersRequestBuilder { - return new MailFoldersRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MailFoldersRequestBuilder(this.pathParameters, this.requestAdapter); } public get messages(): MessagesRequestBuilder { - return new MessagesRequestBuilder(this.urlTemplateParameters, this.requestAdapter); + return new MessagesRequestBuilder(this.pathParameters, this.requestAdapter); } + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new UserRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; /** @@ -42,7 +42,7 @@ export class UserRequestBuilder { */ public mailFoldersById(id: string) : MailFolderRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("mailFolder_id", id); return new MailFolderRequestBuilder(urlTplParams, this.requestAdapter); }; @@ -53,7 +53,7 @@ export class UserRequestBuilder { */ public messagesById(id: string) : MessageRequestBuilder { if(!id) throw new Error("id cannot be undefined"); - const urlTplParams = getUrlTemplateParameters(this.urlTemplateParameters); + const urlTplParams = getPathParameters(this.pathParameters); id && urlTplParams.set("message_id", id); return new MessageRequestBuilder(urlTplParams, this.requestAdapter); }; diff --git a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts index 86601b4c0..11ef2502f 100644 --- a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts @@ -1,24 +1,24 @@ -import {getUrlTemplateParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; +import {getPathParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users */ export class UsersRequestBuilder { + /** Path parameters for the request */ + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ private readonly urlTemplate: string; - /** Url template parameters for the request */ - private readonly urlTemplateParameters: Map; /** * Instantiates a new UsersRequestBuilder and sets the default values. + * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. - * @param urlTemplateParameters The raw url or the Url template parameters for the request. */ - public constructor(urlTemplateParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - if(!urlTemplateParameters) throw new Error("urlTemplateParameters cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; - const urlTplParams = getUrlTemplateParameters(urlTemplateParameters); - this.urlTemplateParameters = urlTplParams; + const urlTplParams = getPathParameters(pathParameters); + this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; }; } From e5d7bc8297fa1367a44d0a0ad568cceeeffaf51d Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 20 Oct 2021 15:44:38 -0400 Subject: [PATCH 12/14] - code-gen: ruby url template support --- msgraph-mail/ruby/graphrubyv4/api_client.rb | 20 ++++-- ...nference_classification_request_builder.rb | 45 ++++++------ ...classification_override_request_builder.rb | 39 ++++++----- .../overrides/overrides_request_builder.rb | 36 +++++----- .../child_folders_request_builder.rb | 36 +++++----- .../item/mail_folder_request_builder.rb | 39 ++++++----- .../item/mail_folder_request_builder.rb | 69 +++++++++++-------- .../item/message_rule_request_builder.rb | 39 ++++++----- .../message_rules_request_builder.rb | 36 +++++----- .../attachments_request_builder.rb | 36 +++++----- .../item/attachment_request_builder.rb | 39 ++++++----- .../extensions/extensions_request_builder.rb | 36 +++++----- .../item/extension_request_builder.rb | 39 ++++++----- .../messages/item/message_request_builder.rb | 65 +++++++++-------- ...egacy_extended_property_request_builder.rb | 39 ++++++----- ...lue_extended_properties_request_builder.rb | 36 +++++----- ...egacy_extended_property_request_builder.rb | 39 ++++++----- ...lue_extended_properties_request_builder.rb | 36 +++++----- .../item/value/content_request_builder.rb | 36 +++++----- .../item/messages/messages_request_builder.rb | 36 +++++----- ...egacy_extended_property_request_builder.rb | 39 ++++++----- ...lue_extended_properties_request_builder.rb | 36 +++++----- ...egacy_extended_property_request_builder.rb | 39 ++++++----- ...lue_extended_properties_request_builder.rb | 36 +++++----- .../mail_folders_request_builder.rb | 36 +++++----- .../attachments_request_builder.rb | 36 +++++----- .../item/attachment_request_builder.rb | 39 ++++++----- .../extensions/extensions_request_builder.rb | 36 +++++----- .../item/extension_request_builder.rb | 39 ++++++----- .../messages/item/message_request_builder.rb | 65 +++++++++-------- ...egacy_extended_property_request_builder.rb | 39 ++++++----- ...lue_extended_properties_request_builder.rb | 36 +++++----- ...egacy_extended_property_request_builder.rb | 39 ++++++----- ...lue_extended_properties_request_builder.rb | 36 +++++----- .../item/value/content_request_builder.rb | 36 +++++----- .../item/messages/messages_request_builder.rb | 36 +++++----- .../users/item/user_request_builder.rb | 44 ++++++------ .../users/users_request_builder.rb | 30 ++++---- 38 files changed, 772 insertions(+), 721 deletions(-) diff --git a/msgraph-mail/ruby/graphrubyv4/api_client.rb b/msgraph-mail/ruby/graphrubyv4/api_client.rb index c8c7a71be..4199e2673 100644 --- a/msgraph-mail/ruby/graphrubyv4/api_client.rb +++ b/msgraph-mail/ruby/graphrubyv4/api_client.rb @@ -10,21 +10,25 @@ module Graphrubyv4 class ApiClient ## - # Path segment to use to build the URL for the current request builder - @path_segment + # Path parameters for the request + @path_parameters ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter + ## + # Url template to use to build the URL for the current request builder + @url_template def users() - return Graphrubyv4::Users::UsersRequestBuilder.new(@path_segment , @request_adapter, false) + return Graphrubyv4::Users::UsersRequestBuilder.new(@path_parameters, @request_adapter) end ## ## Instantiates a new ApiClient and sets the default values. - ## @param requestAdapter The http core service to use to execute the requests. + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## def initialize(request_adapter) - @path_segment = "https://graph.microsoft.com/v1.0" + @path_parameters = Hash.new + @url_template = "https://graph.microsoft.com/v1.0" @request_adapter = request_adapter end ## @@ -33,7 +37,9 @@ def initialize(request_adapter) ## @return a user_request_builder ## def users_by_id(id) - return Graphrubyv4::Users::Item::UserRequestBuilder.new(@path_segment + "/users/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["user_id"] = id + return Graphrubyv4::Users::Item::UserRequestBuilder.new(url_tpl_params, @request_adapter) end end end diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/inference_classification_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/inference_classification_request_builder.rb index cfd464197..f98e01cff 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/inference_classification_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/inference_classification_request_builder.rb @@ -11,33 +11,31 @@ module Graphrubyv4::Users::Item::InferenceClassification # Builds and executes requests for operations under \users\{user-id}\inferenceClassification class InferenceClassificationRequestBuilder - ## - # Current path for the request - @current_path - ## - # Whether the current path is a raw URL - @is_raw_url def overrides() - return Graphrubyv4::Users::Item::InferenceClassification::Overrides::OverridesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::InferenceClassification::Overrides::OverridesRequestBuilder.new(@path_parameters, @request_adapter) end ## - # Path segment to use to build the URL for the current request builder - @path_segment + # Path parameters for the request + @path_parameters ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new InferenceClassificationRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/inferenceClassification" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -61,7 +60,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -76,7 +76,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) @@ -115,7 +116,9 @@ def get(q=nil, h=nil, o=nil, response_handler=nil) ## @return a inference_classification_override_request_builder ## def overrides_by_id(id) - return Graphrubyv4::Users::Item::InferenceClassification::Overrides::Item::InferenceClassificationOverrideRequestBuilder.new(@current_path + @path_segment + "/overrides/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["inferenceClassificationOverride_id"] = id + return Graphrubyv4::Users::Item::InferenceClassification::Overrides::Item::InferenceClassificationOverrideRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Relevance classification of the user's messages based on explicit designations which override inferred relevance or importance. diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/item/inference_classification_override_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/item/inference_classification_override_request_builder.rb index 425aecf1b..ffa1bf387 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/item/inference_classification_override_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/item/inference_classification_override_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::InferenceClassification::Overrides::Item class InferenceClassificationOverrideRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new InferenceClassificationOverrideRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -44,7 +42,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -58,7 +57,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -73,7 +73,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/overrides_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/overrides_request_builder.rb index 991598d93..c70341db3 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/overrides_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/inference_classification/overrides/overrides_request_builder.rb @@ -11,29 +11,27 @@ module Graphrubyv4::Users::Item::InferenceClassification::Overrides class OverridesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new OverridesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/overrides" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## A set of overrides for a user to always classify messages from specific senders in certain ways: focused, or other. Read-only. Nullable. @@ -44,7 +42,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -59,7 +58,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/child_folders_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/child_folders_request_builder.rb index 03ebe3529..60dd0a2a6 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/child_folders_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/child_folders_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::ChildFolders class ChildFoldersRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ChildFoldersRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/childFolders" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of child folders in the mailFolder. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/item/mail_folder_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/item/mail_folder_request_builder.rb index 8b4c40f19..0980e0300 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/item/mail_folder_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/child_folders/item/mail_folder_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::ChildFolders::Item class MailFolderRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MailFolderRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of child folders in the mailFolder. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/mail_folder_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/mail_folder_request_builder.rb index 29dab7daa..004cb7e35 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/mail_folder_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/mail_folder_request_builder.rb @@ -21,52 +21,52 @@ module Graphrubyv4::Users::Item::MailFolders::Item class MailFolderRequestBuilder def child_folders() - return Graphrubyv4::Users::Item::MailFolders::Item::ChildFolders::ChildFoldersRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::ChildFolders::ChildFoldersRequestBuilder.new(@path_parameters, @request_adapter) end - ## - # Current path for the request - @current_path - ## - # Whether the current path is a raw URL - @is_raw_url def message_rules() - return Graphrubyv4::Users::Item::MailFolders::Item::MessageRules::MessageRulesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::MessageRules::MessageRulesRequestBuilder.new(@path_parameters, @request_adapter) end def messages() - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::MessagesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::MessagesRequestBuilder.new(@path_parameters, @request_adapter) end def multi_value_extended_properties() - return Graphrubyv4::Users::Item::MailFolders::Item::MultiValueExtendedProperties::MultiValueExtendedPropertiesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::MultiValueExtendedProperties::MultiValueExtendedPropertiesRequestBuilder.new(@path_parameters, @request_adapter) end ## - # Path segment to use to build the URL for the current request builder - @path_segment + # Path parameters for the request + @path_parameters ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter def single_value_extended_properties() - return Graphrubyv4::Users::Item::MailFolders::Item::SingleValueExtendedProperties::SingleValueExtendedPropertiesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::SingleValueExtendedProperties::SingleValueExtendedPropertiesRequestBuilder.new(@path_parameters, @request_adapter) end ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Gets an item from the graphrubyv4.users.item.mailFolders.item.childFolders.item collection ## @param id Unique identifier of the item ## @return a mail_folder_request_builder ## def child_folders_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::ChildFolders::Item::MailFolderRequestBuilder.new(@current_path + @path_segment + "/childFolders/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["mailFolder_id1"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::ChildFolders::Item::MailFolderRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Instantiates a new MailFolderRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The user's mail folders. Read-only. Nullable. @@ -76,7 +76,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -90,7 +91,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -105,7 +107,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) @@ -144,7 +147,9 @@ def get(q=nil, h=nil, o=nil, response_handler=nil) ## @return a message_rule_request_builder ## def message_rules_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::MessageRules::Item::MessageRuleRequestBuilder.new(@current_path + @path_segment + "/messageRules/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["messageRule_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::MessageRules::Item::MessageRuleRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Gets an item from the graphrubyv4.users.item.mailFolders.item.messages.item collection @@ -152,7 +157,9 @@ def message_rules_by_id(id) ## @return a message_request_builder ## def messages_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MessageRequestBuilder.new(@current_path + @path_segment + "/messages/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["message_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MessageRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Gets an item from the graphrubyv4.users.item.mailFolders.item.multiValueExtendedProperties.item collection @@ -160,7 +167,9 @@ def messages_by_id(id) ## @return a multi_value_legacy_extended_property_request_builder ## def multi_value_extended_properties_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::MultiValueExtendedProperties::Item::MultiValueLegacyExtendedPropertyRequestBuilder.new(@current_path + @path_segment + "/multiValueExtendedProperties/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["multiValueLegacyExtendedProperty_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::MultiValueExtendedProperties::Item::MultiValueLegacyExtendedPropertyRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## The user's mail folders. Read-only. Nullable. @@ -182,7 +191,9 @@ def patch(body, h=nil, o=nil, response_handler=nil) ## @return a single_value_legacy_extended_property_request_builder ## def single_value_extended_properties_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::SingleValueExtendedProperties::Item::SingleValueLegacyExtendedPropertyRequestBuilder.new(@current_path + @path_segment + "/singleValueExtendedProperties/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["singleValueLegacyExtendedProperty_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::SingleValueExtendedProperties::Item::SingleValueLegacyExtendedPropertyRequestBuilder.new(url_tpl_params, @request_adapter) end end end diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/item/message_rule_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/item/message_rule_request_builder.rb index 576e4c0a7..53123b982 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/item/message_rule_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/item/message_rule_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::MessageRules::Item class MessageRuleRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MessageRuleRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of rules that apply to the user's Inbox folder. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/message_rules_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/message_rules_request_builder.rb index 054cab64f..e8fb86fe8 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/message_rules_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/message_rules/message_rules_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::MessageRules class MessageRulesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MessageRulesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/messageRules" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of rules that apply to the user's Inbox folder. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/attachments_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/attachments_request_builder.rb index 2c7647ee4..d4fc95a48 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/attachments_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/attachments_request_builder.rb @@ -14,29 +14,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Attachments class AttachmentsRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new AttachmentsRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/attachments" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The fileAttachment and itemAttachment attachments for the message. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -62,7 +61,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/item/attachment_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/item/attachment_request_builder.rb index 62af5219c..45475730f 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/item/attachment_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/attachments/item/attachment_request_builder.rb @@ -15,29 +15,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Attachments: class AttachmentRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new AttachmentRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The fileAttachment and itemAttachment attachments for the message. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -61,7 +60,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -76,7 +76,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/extensions_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/extensions_request_builder.rb index 00bd569c0..2f829497b 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/extensions_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/extensions_request_builder.rb @@ -14,29 +14,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Extensions class ExtensionsRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ExtensionsRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/extensions" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of open extensions defined for the message. Nullable. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -62,7 +61,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/item/extension_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/item/extension_request_builder.rb index 7c2b9a2fd..4f6fe65e7 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/item/extension_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/extensions/item/extension_request_builder.rb @@ -15,29 +15,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Extensions:: class ExtensionRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ExtensionRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of open extensions defined for the message. Nullable. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -61,7 +60,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -76,7 +76,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/message_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/message_request_builder.rb index 451c5d32e..57678b3a0 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/message_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/message_request_builder.rb @@ -22,52 +22,52 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item class MessageRequestBuilder def attachments() - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Attachments::AttachmentsRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Attachments::AttachmentsRequestBuilder.new(@path_parameters, @request_adapter) end def content() - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Value::ContentRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Value::ContentRequestBuilder.new(@path_parameters, @request_adapter) end - ## - # Current path for the request - @current_path def extensions() - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Extensions::ExtensionsRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Extensions::ExtensionsRequestBuilder.new(@path_parameters, @request_adapter) end - ## - # Whether the current path is a raw URL - @is_raw_url def multi_value_extended_properties() - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MultiValueExtendedProperties::MultiValueExtendedPropertiesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MultiValueExtendedProperties::MultiValueExtendedPropertiesRequestBuilder.new(@path_parameters, @request_adapter) end ## - # Path segment to use to build the URL for the current request builder - @path_segment + # Path parameters for the request + @path_parameters ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter def single_value_extended_properties() - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::SingleValueExtendedProperties::SingleValueExtendedPropertiesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::SingleValueExtendedProperties::SingleValueExtendedPropertiesRequestBuilder.new(@path_parameters, @request_adapter) end ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Gets an item from the graphrubyv4.users.item.mailFolders.item.messages.item.attachments.item collection ## @param id Unique identifier of the item ## @return a attachment_request_builder ## def attachments_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Attachments::Item::AttachmentRequestBuilder.new(@current_path + @path_segment + "/attachments/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["attachment_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Attachments::Item::AttachmentRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Instantiates a new MessageRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of messages in the mailFolder. @@ -77,7 +77,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -91,7 +92,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -106,7 +108,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) @@ -131,7 +134,9 @@ def delete(h=nil, o=nil, response_handler=nil) ## @return a extension_request_builder ## def extensions_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Extensions::Item::ExtensionRequestBuilder.new(@current_path + @path_segment + "/extensions/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["extension_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Extensions::Item::ExtensionRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## The collection of messages in the mailFolder. @@ -153,7 +158,9 @@ def get(q=nil, h=nil, o=nil, response_handler=nil) ## @return a multi_value_legacy_extended_property_request_builder ## def multi_value_extended_properties_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MultiValueExtendedProperties::Item::MultiValueLegacyExtendedPropertyRequestBuilder.new(@current_path + @path_segment + "/multiValueExtendedProperties/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["multiValueLegacyExtendedProperty_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MultiValueExtendedProperties::Item::MultiValueLegacyExtendedPropertyRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## The collection of messages in the mailFolder. @@ -175,7 +182,9 @@ def patch(body, h=nil, o=nil, response_handler=nil) ## @return a single_value_legacy_extended_property_request_builder ## def single_value_extended_properties_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::SingleValueExtendedProperties::Item::SingleValueLegacyExtendedPropertyRequestBuilder.new(@current_path + @path_segment + "/singleValueExtendedProperties/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["singleValueLegacyExtendedProperty_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::SingleValueExtendedProperties::Item::SingleValueLegacyExtendedPropertyRequestBuilder.new(url_tpl_params, @request_adapter) end end end diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb index 94f6925fd..a91b81870 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb @@ -15,29 +15,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MultiValueEx class MultiValueLegacyExtendedPropertyRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of multi-value extended properties defined for the message. Nullable. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -61,7 +60,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -76,7 +76,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb index 239333c21..bdf9cc524 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb @@ -14,29 +14,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::MultiValueEx class MultiValueExtendedPropertiesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/multiValueExtendedProperties" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of multi-value extended properties defined for the message. Nullable. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -62,7 +61,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb index 3b38518b7..8a7524dfb 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb @@ -15,29 +15,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::SingleValueE class SingleValueLegacyExtendedPropertyRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of single-value extended properties defined for the message. Nullable. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -61,7 +60,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -76,7 +76,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb index 45dc5ffaf..f7334bfdf 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb @@ -14,29 +14,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::SingleValueE class SingleValueExtendedPropertiesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/singleValueExtendedProperties" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of single-value extended properties defined for the message. Nullable. @@ -47,7 +45,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -62,7 +61,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/value/content_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/value/content_request_builder.rb index 81a2ced77..90cfe53d9 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/value/content_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/item/value/content_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages::Item::Value class ContentRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ContentRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/$value" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## Get media content for the navigation property messages from users @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_get_request_information(h=nil, o=nil) ## def create_put_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PUT request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/messages_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/messages_request_builder.rb index ae400b17d..8c6f1c15a 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/messages_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/messages/messages_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::Messages class MessagesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MessagesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/messages" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of messages in the mailFolder. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb index 88a783c4f..5d43d9cbe 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::MultiValueExtendedProperties class MultiValueLegacyExtendedPropertyRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb index 0772e419b..8de538638 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::MultiValueExtendedProperties class MultiValueExtendedPropertiesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/multiValueExtendedProperties" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of multi-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb index 704a86c9f..2a861dfe5 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::SingleValueExtendedPropertie class SingleValueLegacyExtendedPropertyRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb index 733285e7d..5cc612ea7 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::MailFolders::Item::SingleValueExtendedPropertie class SingleValueExtendedPropertiesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/singleValueExtendedProperties" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of single-value extended properties defined for the mailFolder. Read-only. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/mail_folders_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/mail_folders_request_builder.rb index 658950e8d..15bef362a 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/mail_folders_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/mail_folders/mail_folders_request_builder.rb @@ -10,29 +10,27 @@ module Graphrubyv4::Users::Item::MailFolders class MailFoldersRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MailFoldersRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/mailFolders" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The user's mail folders. Read-only. Nullable. @@ -43,7 +41,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -58,7 +57,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/attachments_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/attachments_request_builder.rb index 5a6e31c9c..07c88adfb 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/attachments_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/attachments_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::Messages::Item::Attachments class AttachmentsRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new AttachmentsRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/attachments" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The fileAttachment and itemAttachment attachments for the message. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/item/attachment_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/item/attachment_request_builder.rb index b99481c4e..75b37edb4 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/item/attachment_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/attachments/item/attachment_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::Messages::Item::Attachments::Item class AttachmentRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new AttachmentRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The fileAttachment and itemAttachment attachments for the message. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/extensions_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/extensions_request_builder.rb index ac56c6bb1..5e10c555b 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/extensions_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/extensions_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::Messages::Item::Extensions class ExtensionsRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ExtensionsRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/extensions" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of open extensions defined for the message. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/item/extension_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/item/extension_request_builder.rb index 6b538380b..5c99e0413 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/item/extension_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/extensions/item/extension_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::Messages::Item::Extensions::Item class ExtensionRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ExtensionRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of open extensions defined for the message. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/message_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/message_request_builder.rb index 65bec8975..f20200a8d 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/message_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/message_request_builder.rb @@ -20,52 +20,52 @@ module Graphrubyv4::Users::Item::Messages::Item class MessageRequestBuilder def attachments() - return Graphrubyv4::Users::Item::Messages::Item::Attachments::AttachmentsRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::Messages::Item::Attachments::AttachmentsRequestBuilder.new(@path_parameters, @request_adapter) end def content() - return Graphrubyv4::Users::Item::Messages::Item::Value::ContentRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::Messages::Item::Value::ContentRequestBuilder.new(@path_parameters, @request_adapter) end - ## - # Current path for the request - @current_path def extensions() - return Graphrubyv4::Users::Item::Messages::Item::Extensions::ExtensionsRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::Messages::Item::Extensions::ExtensionsRequestBuilder.new(@path_parameters, @request_adapter) end - ## - # Whether the current path is a raw URL - @is_raw_url def multi_value_extended_properties() - return Graphrubyv4::Users::Item::Messages::Item::MultiValueExtendedProperties::MultiValueExtendedPropertiesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::Messages::Item::MultiValueExtendedProperties::MultiValueExtendedPropertiesRequestBuilder.new(@path_parameters, @request_adapter) end ## - # Path segment to use to build the URL for the current request builder - @path_segment + # Path parameters for the request + @path_parameters ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter def single_value_extended_properties() - return Graphrubyv4::Users::Item::Messages::Item::SingleValueExtendedProperties::SingleValueExtendedPropertiesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::Messages::Item::SingleValueExtendedProperties::SingleValueExtendedPropertiesRequestBuilder.new(@path_parameters, @request_adapter) end ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Gets an item from the graphrubyv4.users.item.messages.item.attachments.item collection ## @param id Unique identifier of the item ## @return a attachment_request_builder ## def attachments_by_id(id) - return Graphrubyv4::Users::Item::Messages::Item::Attachments::Item::AttachmentRequestBuilder.new(@current_path + @path_segment + "/attachments/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["attachment_id"] = id + return Graphrubyv4::Users::Item::Messages::Item::Attachments::Item::AttachmentRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Instantiates a new MessageRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The messages in a mailbox or folder. Read-only. Nullable. @@ -75,7 +75,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -89,7 +90,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -104,7 +106,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) @@ -129,7 +132,9 @@ def delete(h=nil, o=nil, response_handler=nil) ## @return a extension_request_builder ## def extensions_by_id(id) - return Graphrubyv4::Users::Item::Messages::Item::Extensions::Item::ExtensionRequestBuilder.new(@current_path + @path_segment + "/extensions/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["extension_id"] = id + return Graphrubyv4::Users::Item::Messages::Item::Extensions::Item::ExtensionRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## The messages in a mailbox or folder. Read-only. Nullable. @@ -151,7 +156,9 @@ def get(q=nil, h=nil, o=nil, response_handler=nil) ## @return a multi_value_legacy_extended_property_request_builder ## def multi_value_extended_properties_by_id(id) - return Graphrubyv4::Users::Item::Messages::Item::MultiValueExtendedProperties::Item::MultiValueLegacyExtendedPropertyRequestBuilder.new(@current_path + @path_segment + "/multiValueExtendedProperties/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["multiValueLegacyExtendedProperty_id"] = id + return Graphrubyv4::Users::Item::Messages::Item::MultiValueExtendedProperties::Item::MultiValueLegacyExtendedPropertyRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## The messages in a mailbox or folder. Read-only. Nullable. @@ -173,7 +180,9 @@ def patch(body, h=nil, o=nil, response_handler=nil) ## @return a single_value_legacy_extended_property_request_builder ## def single_value_extended_properties_by_id(id) - return Graphrubyv4::Users::Item::Messages::Item::SingleValueExtendedProperties::Item::SingleValueLegacyExtendedPropertyRequestBuilder.new(@current_path + @path_segment + "/singleValueExtendedProperties/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["singleValueLegacyExtendedProperty_id"] = id + return Graphrubyv4::Users::Item::Messages::Item::SingleValueExtendedProperties::Item::SingleValueLegacyExtendedPropertyRequestBuilder.new(url_tpl_params, @request_adapter) end end end diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb index e1af9c2e1..db5b3a023 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/item/multi_value_legacy_extended_property_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::Messages::Item::MultiValueExtendedProperties::I class MultiValueLegacyExtendedPropertyRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MultiValueLegacyExtendedPropertyRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of multi-value extended properties defined for the message. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb index 95572ebaa..4a9ffe14f 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/multi_value_extended_properties/multi_value_extended_properties_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::Messages::Item::MultiValueExtendedProperties class MultiValueExtendedPropertiesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MultiValueExtendedPropertiesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/multiValueExtendedProperties" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of multi-value extended properties defined for the message. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb index a5eddbde6..563b10e08 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/item/single_value_legacy_extended_property_request_builder.rb @@ -13,29 +13,27 @@ module Graphrubyv4::Users::Item::Messages::Item::SingleValueExtendedProperties:: class SingleValueLegacyExtendedPropertyRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new SingleValueLegacyExtendedPropertyRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of single-value extended properties defined for the message. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_delete_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :DELETE request_info.set_headers_from_raw_object(h) return request_info; @@ -59,7 +58,8 @@ def create_delete_request_information(h=nil, o=nil) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -74,7 +74,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_patch_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PATCH request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb index 2caa23abc..9018d67a5 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/single_value_extended_properties/single_value_extended_properties_request_builder.rb @@ -12,29 +12,27 @@ module Graphrubyv4::Users::Item::Messages::Item::SingleValueExtendedProperties class SingleValueExtendedPropertiesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new SingleValueExtendedPropertiesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/singleValueExtendedProperties" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The collection of single-value extended properties defined for the message. Nullable. @@ -45,7 +43,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -60,7 +59,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/value/content_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/value/content_request_builder.rb index d6d77b565..08fdd6798 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/value/content_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/item/value/content_request_builder.rb @@ -11,29 +11,27 @@ module Graphrubyv4::Users::Item::Messages::Item::Value class ContentRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new ContentRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/$value" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## Get media content for the navigation property messages from users @@ -43,7 +41,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) return request_info; @@ -57,7 +56,8 @@ def create_get_request_information(h=nil, o=nil) ## def create_put_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :PUT request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/messages/messages_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/messages/messages_request_builder.rb index e04e25760..5545bd2ee 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/messages/messages_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/messages/messages_request_builder.rb @@ -10,29 +10,27 @@ module Graphrubyv4::Users::Item::Messages class MessagesRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new MessagesRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/messages" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## The messages in a mailbox or folder. Read-only. Nullable. @@ -43,7 +41,8 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## def create_get_request_information(q=nil, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :GET request_info.set_headers_from_raw_object(h) request_info.set_query_string_parameters_from_raw_object(q) @@ -58,7 +57,8 @@ def create_get_request_information(q=nil, h=nil, o=nil) ## def create_post_request_information(body, h=nil, o=nil) request_info = MicrosoftKiotaAbstractions::RequestInformation.new() - request_info.set_uri(@current_path, @path_segment, @is_raw_url) + request_info.url_template = @url_template + request_info.path_parameters = @path_parameters request_info.http_method = :POST request_info.set_headers_from_raw_object(h) request_info.set_content_from_parsable(self.request_adapter, "application/json", body) diff --git a/msgraph-mail/ruby/graphrubyv4/users/item/user_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/item/user_request_builder.rb index 8aa028583..02f912bd3 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/item/user_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/item/user_request_builder.rb @@ -12,39 +12,37 @@ module Graphrubyv4::Users::Item # Builds and executes requests for operations under \users\{user-id} class UserRequestBuilder - ## - # Current path for the request - @current_path def inference_classification() - return Graphrubyv4::Users::Item::InferenceClassification::InferenceClassificationRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::InferenceClassification::InferenceClassificationRequestBuilder.new(@path_parameters, @request_adapter) end - ## - # Whether the current path is a raw URL - @is_raw_url def mail_folders() - return Graphrubyv4::Users::Item::MailFolders::MailFoldersRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::MailFolders::MailFoldersRequestBuilder.new(@path_parameters, @request_adapter) end def messages() - return Graphrubyv4::Users::Item::Messages::MessagesRequestBuilder.new(@current_path + @path_segment , @request_adapter, false) + return Graphrubyv4::Users::Item::Messages::MessagesRequestBuilder.new(@path_parameters, @request_adapter) end ## - # Path segment to use to build the URL for the current request builder - @path_segment + # Path parameters for the request + @path_parameters ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new UserRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users/{user_id}" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end ## ## Gets an item from the graphrubyv4.users.item.mailFolders.item collection @@ -52,7 +50,9 @@ def initialize(current_path, request_adapter, is_raw_url=true) ## @return a mail_folder_request_builder ## def mail_folders_by_id(id) - return Graphrubyv4::Users::Item::MailFolders::Item::MailFolderRequestBuilder.new(@current_path + @path_segment + "/mailFolders/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["mailFolder_id"] = id + return Graphrubyv4::Users::Item::MailFolders::Item::MailFolderRequestBuilder.new(url_tpl_params, @request_adapter) end ## ## Gets an item from the graphrubyv4.users.item.messages.item collection @@ -60,7 +60,9 @@ def mail_folders_by_id(id) ## @return a message_request_builder ## def messages_by_id(id) - return Graphrubyv4::Users::Item::Messages::Item::MessageRequestBuilder.new(@current_path + @path_segment + "/messages/" + id, @request_adapter, false) + url_tpl_params = @path_parameters.clone + url_tpl_params["message_id"] = id + return Graphrubyv4::Users::Item::Messages::Item::MessageRequestBuilder.new(url_tpl_params, @request_adapter) end end end diff --git a/msgraph-mail/ruby/graphrubyv4/users/users_request_builder.rb b/msgraph-mail/ruby/graphrubyv4/users/users_request_builder.rb index d7a7ca48e..323a45a39 100644 --- a/msgraph-mail/ruby/graphrubyv4/users/users_request_builder.rb +++ b/msgraph-mail/ruby/graphrubyv4/users/users_request_builder.rb @@ -7,29 +7,27 @@ module Graphrubyv4::Users class UsersRequestBuilder ## - # Current path for the request - @current_path + # Path parameters for the request + @path_parameters ## - # Whether the current path is a raw URL - @is_raw_url - ## - # Path segment to use to build the URL for the current request builder - @path_segment - ## - # The http core service to use to execute the requests. + # The request adapter to use to execute the requests. @request_adapter ## + # Url template to use to build the URL for the current request builder + @url_template + ## ## Instantiates a new UsersRequestBuilder and sets the default values. - ## @param currentPath Current path for the request - ## @param isRawUrl Whether the current path is a raw URL - ## @param requestAdapter The http core service to use to execute the requests. + ## @param pathParameters Path parameters for the request + ## @param requestAdapter The request adapter to use to execute the requests. ## @return a void ## - def initialize(current_path, request_adapter, is_raw_url=true) - @path_segment = "/users" + def initialize(path_parameters, request_adapter) + @url_template = "https://graph.microsoft.com/v1.0/users" @request_adapter = request_adapter - @current_path = current_path - @is_raw_url = is_raw_url + if path_parameters.is_a? String + path_parameters = { "request-raw-url" => path_parameters } + end + @path_parameters = path_parameters end end end From 6318dbe49021cfaf6373dfa449adec1a6bcda746 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 21 Oct 2021 10:58:37 -0400 Subject: [PATCH 13/14] - fixes java project configuration for java17 --- msgraph-mail/java/gradle.properties | 2 +- msgraph-mail/java/utilities/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/msgraph-mail/java/gradle.properties b/msgraph-mail/java/gradle.properties index f3b1740f6..11b21a03e 100644 --- a/msgraph-mail/java/gradle.properties +++ b/msgraph-mail/java/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g +org.gradle.jvmargs=-Xmx2g gpr.user = placeholder gpr.key = placeholder \ No newline at end of file diff --git a/msgraph-mail/java/utilities/gradle.properties b/msgraph-mail/java/utilities/gradle.properties index f3b1740f6..11b21a03e 100644 --- a/msgraph-mail/java/utilities/gradle.properties +++ b/msgraph-mail/java/utilities/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g +org.gradle.jvmargs=-Xmx2g gpr.user = placeholder gpr.key = placeholder \ No newline at end of file From 5a43bc5ddde04449d12ec6d7735822288cb64de6 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 25 Oct 2021 09:11:14 -0400 Subject: [PATCH 14/14] - code-gen: path parameters map type change --- msgraph-mail/dotnet/ApiClient.cs | 4 ++-- .../InferenceClassificationRequestBuilder.cs | 8 ++++---- ...enceClassificationOverrideRequestBuilder.cs | 8 ++++---- .../Overrides/OverridesRequestBuilder.cs | 10 +++++----- .../ChildFolders/ChildFoldersRequestBuilder.cs | 10 +++++----- .../Item/MailFolderRequestBuilder.cs | 8 ++++---- .../Item/MailFolderRequestBuilder.cs | 8 ++++---- .../Item/MessageRuleRequestBuilder.cs | 8 ++++---- .../MessageRules/MessageRulesRequestBuilder.cs | 10 +++++----- .../Attachments/AttachmentsRequestBuilder.cs | 10 +++++----- .../Item/AttachmentRequestBuilder.cs | 8 ++++---- .../Extensions/ExtensionsRequestBuilder.cs | 10 +++++----- .../Extensions/Item/ExtensionRequestBuilder.cs | 8 ++++---- .../Messages/Item/MessageRequestBuilder.cs | 8 ++++---- ...alueLegacyExtendedPropertyRequestBuilder.cs | 8 ++++---- ...ltiValueExtendedPropertiesRequestBuilder.cs | 10 +++++----- ...alueLegacyExtendedPropertyRequestBuilder.cs | 8 ++++---- ...gleValueExtendedPropertiesRequestBuilder.cs | 10 +++++----- .../Item/Value/ContentRequestBuilder.cs | 8 ++++---- .../Item/Messages/MessagesRequestBuilder.cs | 10 +++++----- ...alueLegacyExtendedPropertyRequestBuilder.cs | 8 ++++---- ...ltiValueExtendedPropertiesRequestBuilder.cs | 10 +++++----- ...alueLegacyExtendedPropertyRequestBuilder.cs | 8 ++++---- ...gleValueExtendedPropertiesRequestBuilder.cs | 10 +++++----- .../MailFolders/MailFoldersRequestBuilder.cs | 10 +++++----- .../Attachments/AttachmentsRequestBuilder.cs | 10 +++++----- .../Item/AttachmentRequestBuilder.cs | 8 ++++---- .../Extensions/ExtensionsRequestBuilder.cs | 10 +++++----- .../Extensions/Item/ExtensionRequestBuilder.cs | 8 ++++---- .../Messages/Item/MessageRequestBuilder.cs | 8 ++++---- ...alueLegacyExtendedPropertyRequestBuilder.cs | 8 ++++---- ...ltiValueExtendedPropertiesRequestBuilder.cs | 10 +++++----- ...alueLegacyExtendedPropertyRequestBuilder.cs | 8 ++++---- ...gleValueExtendedPropertiesRequestBuilder.cs | 10 +++++----- .../Item/Value/ContentRequestBuilder.cs | 8 ++++---- .../Item/Messages/MessagesRequestBuilder.cs | 10 +++++----- .../dotnet/Users/Item/UserRequestBuilder.cs | 8 ++++---- .../dotnet/Users/UsersRequestBuilder.cs | 10 +++++----- .../java/graphjavav4/utilities/ApiClient.java | 4 ++-- .../utilities/users/UsersRequestBuilder.java | 8 ++++---- .../users/item/UserRequestBuilder.java | 12 ++++++------ .../InferenceClassificationRequestBuilder.java | 10 +++++----- .../overrides/OverridesRequestBuilder.java | 8 ++++---- ...ceClassificationOverrideRequestBuilder.java | 8 ++++---- .../mailFolders/MailFoldersRequestBuilder.java | 8 ++++---- .../item/MailFolderRequestBuilder.java | 18 +++++++++--------- .../ChildFoldersRequestBuilder.java | 8 ++++---- .../item/MailFolderRequestBuilder.java | 8 ++++---- .../MessageRulesRequestBuilder.java | 8 ++++---- .../item/MessageRuleRequestBuilder.java | 8 ++++---- .../item/messages/MessagesRequestBuilder.java | 8 ++++---- .../messages/item/MessageRequestBuilder.java | 16 ++++++++-------- .../attachments/AttachmentsRequestBuilder.java | 8 ++++---- .../item/AttachmentRequestBuilder.java | 8 ++++---- .../extensions/ExtensionsRequestBuilder.java | 8 ++++---- .../item/ExtensionRequestBuilder.java | 8 ++++---- ...iValueExtendedPropertiesRequestBuilder.java | 8 ++++---- ...ueLegacyExtendedPropertyRequestBuilder.java | 8 ++++---- ...eValueExtendedPropertiesRequestBuilder.java | 8 ++++---- ...ueLegacyExtendedPropertyRequestBuilder.java | 8 ++++---- .../item/value/ContentRequestBuilder.java | 8 ++++---- ...iValueExtendedPropertiesRequestBuilder.java | 8 ++++---- ...ueLegacyExtendedPropertyRequestBuilder.java | 8 ++++---- ...eValueExtendedPropertiesRequestBuilder.java | 8 ++++---- ...ueLegacyExtendedPropertyRequestBuilder.java | 8 ++++---- .../item/messages/MessagesRequestBuilder.java | 8 ++++---- .../messages/item/MessageRequestBuilder.java | 16 ++++++++-------- .../attachments/AttachmentsRequestBuilder.java | 8 ++++---- .../item/AttachmentRequestBuilder.java | 8 ++++---- .../extensions/ExtensionsRequestBuilder.java | 8 ++++---- .../item/ExtensionRequestBuilder.java | 8 ++++---- ...iValueExtendedPropertiesRequestBuilder.java | 8 ++++---- ...ueLegacyExtendedPropertyRequestBuilder.java | 8 ++++---- ...eValueExtendedPropertiesRequestBuilder.java | 8 ++++---- ...ueLegacyExtendedPropertyRequestBuilder.java | 8 ++++---- .../item/value/ContentRequestBuilder.java | 8 ++++---- msgraph-mail/typescript/src/apiClient.ts | 4 ++-- .../inferenceClassificationRequestBuilder.ts | 4 ++-- ...enceClassificationOverrideRequestBuilder.ts | 4 ++-- .../overrides/overridesRequestBuilder.ts | 4 ++-- .../childFolders/childFoldersRequestBuilder.ts | 4 ++-- .../item/mailFolderRequestBuilder.ts | 4 ++-- .../item/mailFolderRequestBuilder.ts | 4 ++-- .../item/messageRuleRequestBuilder.ts | 4 ++-- .../messageRules/messageRulesRequestBuilder.ts | 4 ++-- .../attachments/attachmentsRequestBuilder.ts | 4 ++-- .../item/attachmentRequestBuilder.ts | 4 ++-- .../extensions/extensionsRequestBuilder.ts | 4 ++-- .../extensions/item/extensionRequestBuilder.ts | 4 ++-- .../messages/item/messageRequestBuilder.ts | 4 ++-- ...alueLegacyExtendedPropertyRequestBuilder.ts | 4 ++-- ...ltiValueExtendedPropertiesRequestBuilder.ts | 4 ++-- ...alueLegacyExtendedPropertyRequestBuilder.ts | 4 ++-- ...gleValueExtendedPropertiesRequestBuilder.ts | 4 ++-- .../item/value/contentRequestBuilder.ts | 4 ++-- .../item/messages/messagesRequestBuilder.ts | 4 ++-- ...alueLegacyExtendedPropertyRequestBuilder.ts | 4 ++-- ...ltiValueExtendedPropertiesRequestBuilder.ts | 4 ++-- ...alueLegacyExtendedPropertyRequestBuilder.ts | 4 ++-- ...gleValueExtendedPropertiesRequestBuilder.ts | 4 ++-- .../mailFolders/mailFoldersRequestBuilder.ts | 4 ++-- .../attachments/attachmentsRequestBuilder.ts | 4 ++-- .../item/attachmentRequestBuilder.ts | 4 ++-- .../extensions/extensionsRequestBuilder.ts | 4 ++-- .../extensions/item/extensionRequestBuilder.ts | 4 ++-- .../messages/item/messageRequestBuilder.ts | 4 ++-- ...alueLegacyExtendedPropertyRequestBuilder.ts | 4 ++-- ...ltiValueExtendedPropertiesRequestBuilder.ts | 4 ++-- ...alueLegacyExtendedPropertyRequestBuilder.ts | 4 ++-- ...gleValueExtendedPropertiesRequestBuilder.ts | 4 ++-- .../item/value/contentRequestBuilder.ts | 4 ++-- .../item/messages/messagesRequestBuilder.ts | 4 ++-- .../src/users/item/userRequestBuilder.ts | 4 ++-- .../src/users/usersRequestBuilder.ts | 4 ++-- 114 files changed, 409 insertions(+), 409 deletions(-) diff --git a/msgraph-mail/dotnet/ApiClient.cs b/msgraph-mail/dotnet/ApiClient.cs index 1e5256621..ce749c6e4 100644 --- a/msgraph-mail/dotnet/ApiClient.cs +++ b/msgraph-mail/dotnet/ApiClient.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4 { /// The main entry point of the SDK, exposes the configuration and the fluent API. public class ApiClient { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -24,7 +24,7 @@ public class ApiClient { /// public ApiClient(IRequestAdapter requestAdapter) { _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); - PathParameters = new Dictionary(); + PathParameters = new Dictionary(); UrlTemplate = "https://graph.microsoft.com/v1.0"; RequestAdapter = requestAdapter; ApiClientBuilder.RegisterDefaultSerializer(); diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs index 6c356a116..3cc22e881 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/InferenceClassificationRequestBuilder.cs @@ -14,7 +14,7 @@ public class InferenceClassificationRequestBuilder { new OverridesRequestBuilder(PathParameters, RequestAdapter); } /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -24,11 +24,11 @@ public class InferenceClassificationRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public InferenceClassificationRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public InferenceClassificationRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -41,7 +41,7 @@ public InferenceClassificationRequestBuilder(string rawUrl, IRequestAdapter requ if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs index f504b9801..6dbfff65b 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/Item/InferenceClassificationOverrideRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification.Overrides.Item { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification\overrides\{inferenceClassificationOverride-id} public class InferenceClassificationOverrideRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class InferenceClassificationOverrideRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public InferenceClassificationOverrideRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public InferenceClassificationOverrideRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public InferenceClassificationOverrideRequestBuilder(string rawUrl, IRequestAdap if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs index 56390288c..83cc72c2d 100644 --- a/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/InferenceClassification/Overrides/OverridesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.InferenceClassification.Overrides { /// Builds and executes requests for operations under \users\{user-id}\inferenceClassification\overrides public class OverridesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.inferenceClassification.overrides.item collection public InferenceClassificationOverrideRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("inferenceClassificationOverride_id", position); return new InferenceClassificationOverrideRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public InferenceClassificationOverrideRequestBuilder this[string position] { get /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public OverridesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public OverridesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public OverridesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs index b670e2931..684dd009f 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/ChildFoldersRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.ChildFolders { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\childFolders public class ChildFoldersRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.childFolders.item collection public MailFolderRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("mailFolder_id1", position); return new MailFolderRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MailFolderRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ChildFoldersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ChildFoldersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public ChildFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs index c3f5e6358..7f72697d8 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/ChildFolders/Item/MailFolderRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.ChildFolders.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\childFolders\{mailFolder-id1} public class MailFolderRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class MailFolderRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MailFolderRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MailFolderRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs index c2d7e1773..a98749d75 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MailFolderRequestBuilder.cs @@ -27,7 +27,7 @@ public class MailFolderRequestBuilder { new MultiValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => @@ -40,11 +40,11 @@ public class MailFolderRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MailFolderRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MailFolderRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -57,7 +57,7 @@ public MailFolderRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs index 8a31e5bf2..a6015aa84 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/Item/MessageRuleRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MessageRules.Item { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messageRules\{messageRule-id} public class MessageRuleRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class MessageRuleRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MessageRuleRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MessageRuleRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public MessageRuleRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs index cd263bb7d..2f3114111 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MessageRules/MessageRulesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MessageRules { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messageRules public class MessageRulesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messageRules.item collection public MessageRuleRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("messageRule_id", position); return new MessageRuleRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MessageRuleRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MessageRulesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MessageRulesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MessageRulesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs index eb42b5308..0f9640009 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Attachments { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\attachments public class AttachmentsRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.attachments.item collection public AttachmentRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("attachment_id", position); return new AttachmentRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public AttachmentRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public AttachmentsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public AttachmentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs index 382f6cd3a..431934316 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Attachments.It /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\attachments\{attachment-id} public class AttachmentRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class AttachmentRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public AttachmentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public AttachmentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public AttachmentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index 9beee3c6e..8300bd20a 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Extensions { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\extensions public class ExtensionsRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.extensions.item collection public ExtensionRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("extension_id", position); return new ExtensionRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public ExtensionRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ExtensionsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public ExtensionsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs index bbb389bff..0dfb08ae3 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Extensions.Ite /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\extensions\{extension-id} public class ExtensionRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class ExtensionRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ExtensionRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ExtensionRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public ExtensionRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs index dd2d2ae20..bdbce0b18 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MessageRequestBuilder.cs @@ -27,7 +27,7 @@ public class MessageRequestBuilder { new MultiValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => @@ -40,11 +40,11 @@ public class MessageRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MessageRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MessageRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -57,7 +57,7 @@ public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs index 4c130323d..b86f2a126 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.MultiValueExte /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAda if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index e249c70a9..70602912a 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.MultiValueExte /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index 6b3efc093..dad5dd018 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.SingleValueExt /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAd if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 3bfdadfa9..ed412d30d 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.SingleValueExt /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { g /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapte if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs index a98d888b2..9947a8d81 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -9,7 +9,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages.Item.Value { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages\{message-id}\$value public class ContentRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -19,11 +19,11 @@ public class ContentRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ContentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ContentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -36,7 +36,7 @@ public ContentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs index 5d0db6605..0cf5bd141 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/Messages/MessagesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.Messages { /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\messages public class MessagesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.messages.item collection public MessageRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("message_id", position); return new MessageRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MessageRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MessagesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MessagesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MessagesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs index a32863ca6..ca21d9143 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MultiValueExtendedProperties /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAda if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index 5f07e6216..b159728cc 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.MultiValueExtendedProperties /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index ddf7666bf..267c16298 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.SingleValueExtendedPropertie /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAd if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index c3c6d0ac8..520ec9eec 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders.Item.SingleValueExtendedPropertie /// Builds and executes requests for operations under \users\{user-id}\mailFolders\{mailFolder-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { g /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapte if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs index cb2004dd8..d0475cbac 100644 --- a/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/MailFolders/MailFoldersRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.MailFolders { /// Builds and executes requests for operations under \users\{user-id}\mailFolders public class MailFoldersRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.mailFolders.item collection public MailFolderRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("mailFolder_id", position); return new MailFolderRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MailFolderRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MailFoldersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MailFoldersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MailFoldersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs index 3fadbb6d3..3df104b6f 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/AttachmentsRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Attachments { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\attachments public class AttachmentsRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.attachments.item collection public AttachmentRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("attachment_id", position); return new AttachmentRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public AttachmentRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public AttachmentsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public AttachmentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs index a7e795632..875019d4b 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Attachments/Item/AttachmentRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Attachments.Item { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\attachments\{attachment-id} public class AttachmentRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class AttachmentRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public AttachmentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public AttachmentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public AttachmentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs index ecaa18eb0..df254f751 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/ExtensionsRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Extensions { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\extensions public class ExtensionsRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.extensions.item collection public ExtensionRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("extension_id", position); return new ExtensionRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public ExtensionRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ExtensionsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public ExtensionsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs index fb125f6d4..cb4357a7c 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Extensions/Item/ExtensionRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Extensions.Item { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\extensions\{extension-id} public class ExtensionRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class ExtensionRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ExtensionRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ExtensionRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public ExtensionRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs index 3984c8337..34bad8b6a 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MessageRequestBuilder.cs @@ -27,7 +27,7 @@ public class MessageRequestBuilder { new MultiValueExtendedPropertiesRequestBuilder(PathParameters, RequestAdapter); } /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } public SingleValueExtendedPropertiesRequestBuilder SingleValueExtendedProperties { get => @@ -40,11 +40,11 @@ public class MessageRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MessageRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MessageRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -57,7 +57,7 @@ public MessageRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs index c56ba6618..02898bd8a 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/Item/MultiValueLegacyExtendedPropertyRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.MultiValueExtendedProperties.It /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\multiValueExtendedProperties\{multiValueLegacyExtendedProperty-id} public class MultiValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAda if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs index d4f8cef76..d94cf742f 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/MultiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.MultiValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\multiValueExtendedProperties public class MultiValueExtendedPropertiesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.multiValueExtendedProperties.item collection public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("multiValueLegacyExtendedProperty_id", position); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MultiValueLegacyExtendedPropertyRequestBuilder this[string position] { ge /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MultiValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapter if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs index e5100597f..abc61a15f 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/Item/SingleValueLegacyExtendedPropertyRequestBuilder.cs @@ -10,7 +10,7 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.SingleValueExtendedProperties.I /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\singleValueExtendedProperties\{singleValueLegacyExtendedProperty-id} public class SingleValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -20,11 +20,11 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -37,7 +37,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(string rawUrl, IRequestAd if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs index 26e7052a3..27a3aadbd 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/SingleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.SingleValueExtendedProperties { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\singleValueExtendedProperties public class SingleValueExtendedPropertiesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item.singleValueExtendedProperties.item collection public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("singleValueLegacyExtendedProperty_id", position); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public SingleValueLegacyExtendedPropertyRequestBuilder this[string position] { g /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public SingleValueExtendedPropertiesRequestBuilder(string rawUrl, IRequestAdapte if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs index 43c80a4a2..37778a353 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/Item/Value/ContentRequestBuilder.cs @@ -9,7 +9,7 @@ namespace Graphdotnetv4.Users.Item.Messages.Item.Value { /// Builds and executes requests for operations under \users\{user-id}\messages\{message-id}\$value public class ContentRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -19,11 +19,11 @@ public class ContentRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public ContentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public ContentRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -36,7 +36,7 @@ public ContentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs index 1b41c304a..bbbc5111b 100644 --- a/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/Messages/MessagesRequestBuilder.cs @@ -11,14 +11,14 @@ namespace Graphdotnetv4.Users.Item.Messages { /// Builds and executes requests for operations under \users\{user-id}\messages public class MessagesRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item.messages.item collection public MessageRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("message_id", position); return new MessageRequestBuilder(urlTplParams, RequestAdapter); } } @@ -27,11 +27,11 @@ public MessageRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public MessagesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public MessagesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -44,7 +44,7 @@ public MessagesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs b/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs index f427220bd..3c9d476bb 100644 --- a/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/Item/UserRequestBuilder.cs @@ -20,7 +20,7 @@ public class UserRequestBuilder { new MessagesRequestBuilder(PathParameters, RequestAdapter); } /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder @@ -30,11 +30,11 @@ public class UserRequestBuilder { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public UserRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public UserRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -47,7 +47,7 @@ public UserRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs index a1b3a1a98..22cdf316e 100644 --- a/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs +++ b/msgraph-mail/dotnet/Users/UsersRequestBuilder.cs @@ -9,14 +9,14 @@ namespace Graphdotnetv4.Users { /// Builds and executes requests for operations under \users public class UsersRequestBuilder { /// Path parameters for the request - private Dictionary PathParameters { get; set; } + private Dictionary PathParameters { get; set; } /// The request adapter to use to execute the requests. private IRequestAdapter RequestAdapter { get; set; } /// Url template to use to build the URL for the current request builder private string UrlTemplate { get; set; } /// Gets an item from the Graphdotnetv4.users.item collection public UserRequestBuilder this[string position] { get { - var urlTplParams = new Dictionary(PathParameters); + var urlTplParams = new Dictionary(PathParameters); urlTplParams.Add("user_id", position); return new UserRequestBuilder(urlTplParams, RequestAdapter); } } @@ -25,11 +25,11 @@ public UserRequestBuilder this[string position] { get { /// Path parameters for the request /// The request adapter to use to execute the requests. /// - public UsersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { + public UsersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) { _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users"; - var urlTplParams = new Dictionary(pathParameters); + var urlTplParams = new Dictionary(pathParameters); PathParameters = urlTplParams; RequestAdapter = requestAdapter; } @@ -42,7 +42,7 @@ public UsersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) { if(string.IsNullOrEmpty(rawUrl)) throw new ArgumentNullException(nameof(rawUrl)); _ = requestAdapter ?? throw new ArgumentNullException(nameof(requestAdapter)); UrlTemplate = "https://graph.microsoft.com/v1.0/users"; - var urlTplParams = new Dictionary(); + var urlTplParams = new Dictionary(); urlTplParams.Add("request-raw-url", rawUrl); PathParameters = urlTplParams; RequestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java index f5f25b19f..258b2b2a4 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/ApiClient.java @@ -13,7 +13,7 @@ /** The main entry point of the SDK, exposes the configuration and the fluent API. */ public class ApiClient { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -43,7 +43,7 @@ public ApiClient(@javax.annotation.Nonnull final RequestAdapter requestAdapter) @javax.annotation.Nonnull public UserRequestBuilder users(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("user_id", id); return new UserRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java index ea96137fe..70c4e6845 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/UsersRequestBuilder.java @@ -6,7 +6,7 @@ /** Builds and executes requests for operations under /users */ public class UsersRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -17,11 +17,11 @@ public class UsersRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -33,7 +33,7 @@ public UsersRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java index ac53f63ee..f26327f59 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/UserRequestBuilder.java @@ -23,7 +23,7 @@ public MessagesRequestBuilder messages() { return new MessagesRequestBuilder(pathParameters, requestAdapter); } /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -34,11 +34,11 @@ public MessagesRequestBuilder messages() { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public UserRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public UserRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -50,7 +50,7 @@ public UserRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; @@ -63,7 +63,7 @@ public UserRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax. @javax.annotation.Nonnull public MailFolderRequestBuilder mailFolders(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("mailFolder_id", id); return new MailFolderRequestBuilder(urlTplParams, requestAdapter); } @@ -75,7 +75,7 @@ public MailFolderRequestBuilder mailFolders(@javax.annotation.Nonnull final Stri @javax.annotation.Nonnull public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("message_id", id); return new MessageRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java index 49ed9be83..14183491e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/InferenceClassificationRequestBuilder.java @@ -22,7 +22,7 @@ public OverridesRequestBuilder overrides() { return new OverridesRequestBuilder(pathParameters, requestAdapter); } /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -33,11 +33,11 @@ public OverridesRequestBuilder overrides() { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -49,7 +49,7 @@ public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final Has */ public InferenceClassificationRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; @@ -321,7 +321,7 @@ public java.util.concurrent.CompletableFuture get(@java @javax.annotation.Nonnull public InferenceClassificationOverrideRequestBuilder overrides(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("inferenceClassificationOverride_id", id); return new InferenceClassificationOverrideRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java index 2064f07e3..40ac3840d 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/OverridesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ public class OverridesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class OverridesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public OverridesRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java index cb78f6cbe..1bc32d5aa 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/inferenceClassification/overrides/item/InferenceClassificationOverrideRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ public class InferenceClassificationOverrideRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class InferenceClassificationOverrideRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull f */ public InferenceClassificationOverrideRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java index 9bfd56e2f..196a35d53 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/MailFoldersRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ public class MailFoldersRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MailFoldersRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MailFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java index c8519b530..e0ea5e6dd 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/MailFolderRequestBuilder.java @@ -41,7 +41,7 @@ public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() return new MultiValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull @@ -58,7 +58,7 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public MailFolderRequestBuilder childFolders(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("mailFolder_id1", id); return new MailFolderRequestBuilder(urlTplParams, requestAdapter); } @@ -68,11 +68,11 @@ public MailFolderRequestBuilder childFolders(@javax.annotation.Nonnull final Str * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -84,7 +84,7 @@ public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; @@ -356,7 +356,7 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation. @javax.annotation.Nonnull public MessageRuleRequestBuilder messageRules(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("messageRule_id", id); return new MessageRuleRequestBuilder(urlTplParams, requestAdapter); } @@ -368,7 +368,7 @@ public MessageRuleRequestBuilder messageRules(@javax.annotation.Nonnull final St @javax.annotation.Nonnull public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("message_id", id); return new MessageRequestBuilder(urlTplParams, requestAdapter); } @@ -380,7 +380,7 @@ public MessageRequestBuilder messages(@javax.annotation.Nonnull final String id) @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } @@ -451,7 +451,7 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java index 05c537817..eaab64ed9 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/ChildFoldersRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ public class ChildFoldersRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class ChildFoldersRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public ChildFoldersRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java index e056ed65e..7cda48c54 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/childFolders/item/MailFolderRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ public class MailFolderRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MailFolderRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MailFolderRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java index e33ed870b..5c8b96c3a 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/MessageRulesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ public class MessageRulesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MessageRulesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MessageRulesRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java index 19e1e73c7..5b4937976 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messageRules/item/MessageRuleRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ public class MessageRuleRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MessageRuleRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MessageRuleRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java index c17962a36..a1f7f1fde 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/MessagesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ public class MessagesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MessagesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java index 1d3a51d04..a1eafb132 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/MessageRequestBuilder.java @@ -41,7 +41,7 @@ public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() return new MultiValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull @@ -58,7 +58,7 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, requestAdapter); } @@ -68,11 +68,11 @@ public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final Stri * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -84,7 +84,7 @@ public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; @@ -286,7 +286,7 @@ public java.util.concurrent.CompletableFuture delete(@javax.annotation.Nul @javax.annotation.Nonnull public ExtensionRequestBuilder extensions(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, requestAdapter); } @@ -368,7 +368,7 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation.Nul @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } @@ -439,7 +439,7 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java index 2797630c6..b5c641570 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ public class AttachmentsRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class AttachmentsRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java index 7f34ba31e..203772cf1 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ public class AttachmentRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class AttachmentRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java index 5df584b6a..5ad42f6b5 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ public class ExtensionsRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class ExtensionsRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java index 17c8e02d9..4b6f781d3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ public class ExtensionRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class ExtensionRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index ca2d137df..f28cda33f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MultiValueExtendedPropertiesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fina */ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 57ea61c6f..a640a7251 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull */ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 7b738260f..f5a5f6991 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class SingleValueExtendedPropertiesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fin */ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index b89ad411b..fd3fbaebb 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull */ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java index b972b9e50..e45ac6a5c 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/messages/item/value/ContentRequestBuilder.java @@ -15,7 +15,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ public class ContentRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -26,11 +26,11 @@ public class ContentRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -42,7 +42,7 @@ public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index 7007973c1..63e2d3866 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MultiValueExtendedPropertiesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fina */ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index b5373cc03..3d1983822 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull */ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index cf2140e8b..5d31a6479 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class SingleValueExtendedPropertiesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fin */ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index 7bbc3a131..f7c1c21ce 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/mailFolders/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull */ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java index defa28dc9..8a9ad33e6 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/MessagesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages */ public class MessagesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MessagesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MessagesRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java index f827be55b..9a321a47e 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/MessageRequestBuilder.java @@ -41,7 +41,7 @@ public MultiValueExtendedPropertiesRequestBuilder multiValueExtendedProperties() return new MultiValueExtendedPropertiesRequestBuilder(pathParameters, requestAdapter); } /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; @javax.annotation.Nonnull @@ -58,7 +58,7 @@ public SingleValueExtendedPropertiesRequestBuilder singleValueExtendedProperties @javax.annotation.Nonnull public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("attachment_id", id); return new AttachmentRequestBuilder(urlTplParams, requestAdapter); } @@ -68,11 +68,11 @@ public AttachmentRequestBuilder attachments(@javax.annotation.Nonnull final Stri * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -84,7 +84,7 @@ public MessageRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; @@ -286,7 +286,7 @@ public java.util.concurrent.CompletableFuture delete(@javax.annotation.Nul @javax.annotation.Nonnull public ExtensionRequestBuilder extensions(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("extension_id", id); return new ExtensionRequestBuilder(urlTplParams, requestAdapter); } @@ -368,7 +368,7 @@ public java.util.concurrent.CompletableFuture get(@javax.annotation.Nul @javax.annotation.Nonnull public MultiValueLegacyExtendedPropertyRequestBuilder multiValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("multiValueLegacyExtendedProperty_id", id); return new MultiValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } @@ -439,7 +439,7 @@ public java.util.concurrent.CompletableFuture patch(@javax.annotation.Nonn @javax.annotation.Nonnull public SingleValueLegacyExtendedPropertyRequestBuilder singleValueExtendedProperties(@javax.annotation.Nonnull final String id) { Objects.requireNonNull(id); - var urlTplParams = new HashMap(this.pathParameters); + var urlTplParams = new HashMap(this.pathParameters); urlTplParams.put("singleValueLegacyExtendedProperty_id", id); return new SingleValueLegacyExtendedPropertyRequestBuilder(urlTplParams, requestAdapter); } diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java index 9daed74db..41c734b14 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/AttachmentsRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ public class AttachmentsRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class AttachmentsRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public AttachmentsRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java index ec4a39da0..fb76bdf9c 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/attachments/item/AttachmentRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ public class AttachmentRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class AttachmentRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public AttachmentRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java index c16effccb..749da5b5f 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/ExtensionsRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ public class ExtensionsRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class ExtensionsRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public ExtensionsRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java index fdf56924e..d30cf638a 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/extensions/item/ExtensionRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ public class ExtensionRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class ExtensionRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public ExtensionRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java index df1e81ac3..2b92f7941 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/MultiValueExtendedPropertiesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ public class MultiValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MultiValueExtendedPropertiesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fina */ public MultiValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java index 94ff4012e..4c1fd98e4 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/multiValueExtendedProperties/item/MultiValueLegacyExtendedPropertyRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ public class MultiValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class MultiValueLegacyExtendedPropertyRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull */ public MultiValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java index 6509d240c..aa7dd4621 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/SingleValueExtendedPropertiesRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ public class SingleValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class SingleValueExtendedPropertiesRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull fin */ public SingleValueExtendedPropertiesRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java index ecea7b9e3..928cd16ab 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/singleValueExtendedProperties/item/SingleValueLegacyExtendedPropertyRequestBuilder.java @@ -16,7 +16,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ public class SingleValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,11 +27,11 @@ public class SingleValueLegacyExtendedPropertyRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -43,7 +43,7 @@ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull */ public SingleValueLegacyExtendedPropertyRequestBuilder(@javax.annotation.Nonnull final String rawUrl, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; - var urlTplParams = new HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java index 208c6e0c6..38041aad3 100644 --- a/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java +++ b/msgraph-mail/java/utilities/src/main/java/graphjavav4/utilities/users/item/messages/item/value/ContentRequestBuilder.java @@ -15,7 +15,7 @@ /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ public class ContentRequestBuilder { /** Path parameters for the request */ - private final HashMap pathParameters; + private final HashMap pathParameters; /** The request adapter to use to execute the requests. */ private final RequestAdapter requestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -26,11 +26,11 @@ public class ContentRequestBuilder { * @param requestAdapter The request adapter to use to execute the requests. * @return a void */ - public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { + public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap pathParameters, @javax.annotation.Nonnull final RequestAdapter requestAdapter) { Objects.requireNonNull(pathParameters); Objects.requireNonNull(requestAdapter); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; - var urlTplParams = new HashMap(pathParameters); + var urlTplParams = new HashMap(pathParameters); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; } @@ -42,7 +42,7 @@ public ContentRequestBuilder(@javax.annotation.Nonnull final HashMap(); + var urlTplParams = new HashMap(); urlTplParams.put("request-raw-url", rawUrl); this.pathParameters = urlTplParams; this.requestAdapter = requestAdapter; diff --git a/msgraph-mail/typescript/src/apiClient.ts b/msgraph-mail/typescript/src/apiClient.ts index 478030e68..e064e0dfe 100644 --- a/msgraph-mail/typescript/src/apiClient.ts +++ b/msgraph-mail/typescript/src/apiClient.ts @@ -6,7 +6,7 @@ import {JsonParseNodeFactory, JsonSerializationWriterFactory} from '@microsoft/k /** The main entry point of the SDK, exposes the configuration and the fluent API. */ export class ApiClient { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -20,7 +20,7 @@ export class ApiClient { */ public constructor(requestAdapter: RequestAdapter) { if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); - this.pathParameters = new Map(); + this.pathParameters = new Map(); this.urlTemplate = "https://graph.microsoft.com/v1.0"; this.requestAdapter = requestAdapter; registerDefaultSerializer(JsonSerializationWriterFactory); diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts index 180ea0549..b879417e7 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/inferenceClassificationRequestBuilder.ts @@ -9,7 +9,7 @@ export class InferenceClassificationRequestBuilder { return new OverridesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -19,7 +19,7 @@ export class InferenceClassificationRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts index b90f048bd..7574070a4 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/item/inferenceClassificationOverrideRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id} */ export class InferenceClassificationOverrideRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class InferenceClassificationOverrideRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts index 302cae56a..5fd9fcd88 100644 --- a/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/inferenceClassification/overrides/overridesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides */ export class OverridesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class OverridesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts index 3d2328235..d1277e36b 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/childFoldersRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders */ export class ChildFoldersRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class ChildFoldersRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts index 4c2cc9a99..7a14f98be 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/childFolders/item/mailFolderRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1} */ export class MailFolderRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class MailFolderRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/childFolders/{mailFolder_id1}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts index 7ef1608ee..3325d62ad 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/mailFolderRequestBuilder.ts @@ -26,7 +26,7 @@ export class MailFolderRequestBuilder { return new MultiValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { @@ -50,7 +50,7 @@ export class MailFolderRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts index 159e4edc1..7c8feef3d 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/item/messageRuleRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id} */ export class MessageRuleRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class MessageRuleRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules/{messageRule_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts index 191480d1c..d7017ac91 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messageRules/messageRulesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules */ export class MessageRulesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MessageRulesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messageRules{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts index 17229c2fc..95632f3de 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class AttachmentsRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts index c2e17b3e3..df81bb8a2 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class AttachmentRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts index 2471d5209..718fbe4f4 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class ExtensionsRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts index cf9a0040d..9e112b584 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class ExtensionRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts index 9fd766fbc..cc06972f3 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/messageRequestBuilder.ts @@ -25,7 +25,7 @@ export class MessageRequestBuilder { return new MultiValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { @@ -49,7 +49,7 @@ export class MessageRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 6750cdd44..b16f96e60 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index 182629f2c..9d2ee75c7 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index e76bc1b31..242b9fd5f 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index 30c6f8712..708c97a1e 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts index d94b7e0d6..ce0cd3e2b 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/item/value/contentRequestBuilder.ts @@ -4,7 +4,7 @@ import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value */ export class ContentRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class ContentRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages/{message_id}/$value"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts index b8b5f3535..1d191d753 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/messages/messagesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages */ export class MessagesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MessagesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index 29feb3e9b..0cf7c538d 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index b92340915..caf1de92e 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 588a7893c..f47a0fdfd 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index f64db1780..c1b44d1a8 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders/{mailFolder_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts index 96d0202c3..dc69d2f62 100644 --- a/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/mailFolders/mailFoldersRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/mailFolders */ export class MailFoldersRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MailFoldersRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/mailFolders{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts index a89a477db..a362f7b2c 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/attachmentsRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments */ export class AttachmentsRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class AttachmentsRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts index c9ebb85f1..8ce175086 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/attachments/item/attachmentRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id} */ export class AttachmentRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class AttachmentRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/attachments/{attachment_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts index 63928c4b0..4fffc4b19 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/extensionsRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions */ export class ExtensionsRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class ExtensionsRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts index 6351cdb72..b0ea87e16 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/extensions/item/extensionRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id} */ export class ExtensionRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class ExtensionRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/extensions/{extension_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts index 0f16c2627..44a932482 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/messageRequestBuilder.ts @@ -25,7 +25,7 @@ export class MessageRequestBuilder { return new MultiValueExtendedPropertiesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; public get singleValueExtendedProperties(): SingleValueExtendedPropertiesRequestBuilder { @@ -49,7 +49,7 @@ export class MessageRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts index e528ee407..a135b20fa 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/item/multiValueLegacyExtendedPropertyRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty-id} */ export class MultiValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class MultiValueLegacyExtendedPropertyRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties/{multiValueLegacyExtendedProperty_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts index 45df0a84c..febf4da83 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/multiValueExtendedProperties/multiValueExtendedPropertiesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/multiValueExtendedProperties */ export class MultiValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MultiValueExtendedPropertiesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/multiValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts index 8a7914158..0c6ec7265 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/item/singleValueLegacyExtendedPropertyRequestBuilder.ts @@ -4,7 +4,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty-id} */ export class SingleValueLegacyExtendedPropertyRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class SingleValueLegacyExtendedPropertyRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties/{singleValueLegacyExtendedProperty_id}{?select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts index bc59e988a..2a5afecfc 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/singleValueExtendedProperties/singleValueExtendedPropertiesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/singleValueExtendedProperties */ export class SingleValueExtendedPropertiesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class SingleValueExtendedPropertiesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/singleValueExtendedProperties{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts index 2dc7cfd61..325f29595 100644 --- a/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/item/value/contentRequestBuilder.ts @@ -4,7 +4,7 @@ import {ReadableStream} from 'web-streams-polyfill/es2018'; /** Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value */ export class ContentRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -14,7 +14,7 @@ export class ContentRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}/$value"; diff --git a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts index e3e91e2f8..0c886ff58 100644 --- a/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/messages/messagesRequestBuilder.ts @@ -5,7 +5,7 @@ import {getPathParameters, HttpMethod, Parsable, RequestAdapter, RequestInformat /** Builds and executes requests for operations under /users/{user-id}/messages */ export class MessagesRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -15,7 +15,7 @@ export class MessagesRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/messages{?top,skip,search,filter,count,orderby,select,expand}"; diff --git a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts index b8df0b067..354407dd1 100644 --- a/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/item/userRequestBuilder.ts @@ -17,7 +17,7 @@ export class UserRequestBuilder { return new MessagesRequestBuilder(this.pathParameters, this.requestAdapter); } /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -27,7 +27,7 @@ export class UserRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}"; diff --git a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts index 11ef2502f..0a8d8ad9f 100644 --- a/msgraph-mail/typescript/src/users/usersRequestBuilder.ts +++ b/msgraph-mail/typescript/src/users/usersRequestBuilder.ts @@ -3,7 +3,7 @@ import {getPathParameters, RequestAdapter} from '@microsoft/kiota-abstractions'; /** Builds and executes requests for operations under /users */ export class UsersRequestBuilder { /** Path parameters for the request */ - private readonly pathParameters: Map; + private readonly pathParameters: Map; /** The request adapter to use to execute the requests. */ private readonly requestAdapter: RequestAdapter; /** Url template to use to build the URL for the current request builder */ @@ -13,7 +13,7 @@ export class UsersRequestBuilder { * @param pathParameters The raw url or the Url template parameters for the request. * @param requestAdapter The request adapter to use to execute the requests. */ - public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { + public constructor(pathParameters: Map | string | undefined, requestAdapter: RequestAdapter) { if(!pathParameters) throw new Error("pathParameters cannot be undefined"); if(!requestAdapter) throw new Error("requestAdapter cannot be undefined"); this.urlTemplate = "https://graph.microsoft.com/v1.0/users";