From ba083832d25fc69934aae563b2e0894464e5555b Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 16 Sep 2020 10:41:07 -0400 Subject: [PATCH 1/4] - adds a vararg support for build request in java templates --- ...yCollectionReferenceRequestBuilder.java.tt | 17 +++++++++++++++-- ...BaseEntityCollectionRequestBuilder.java.tt | 17 +++++++++++++++-- ...ectionWithReferencesRequestBuilder.java.tt | 17 +++++++++++++++-- .../BaseEntityReferenceRequestBuilder.java.tt | 6 ++++-- .../BaseEntityRequestBuilder.java.tt | 6 ++++-- .../BaseEntityStreamRequestBuilder.java.tt | 6 ++++-- ...eEntityWithReferenceRequestBuilder.java.tt | 6 ++++-- ...BaseMethodCollectionRequestBuilder.java.tt | 19 ++++++++++++++++--- .../BaseMethodRequestBuilder.java.tt | 6 ++++-- ...yCollectionReferenceRequestBuilder.java.tt | 16 ++++++++++++++-- ...BaseEntityCollectionRequestBuilder.java.tt | 14 +++++++++++++- ...ectionWithReferencesRequestBuilder.java.tt | 16 ++++++++++++++-- ...IBaseEntityReferenceRequestBuilder.java.tt | 3 ++- .../IBaseEntityRequestBuilder.java.tt | 3 ++- .../IBaseEntityStreamRequestBuilder.java.tt | 3 ++- ...eEntityWithReferenceRequestBuilder.java.tt | 3 ++- ...BaseMethodCollectionRequestBuilder.java.tt | 14 +++++++++++++- .../IBaseMethodRequestBuilder.java.tt | 3 ++- 18 files changed, 145 insertions(+), 30 deletions(-) diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt index 6b1545697..a9e655975 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt @@ -9,6 +9,7 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; +import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionReferenceRequestBuilder())#> @@ -23,10 +24,22 @@ import <#=importNamespace#>.core.IBaseClient; super(requestUrl, client, requestOptions); } - public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List.options.Option> requestOptions) { return new <#=c.TypeCollectionReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions); } diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt index 9816d8351..82b3a5f7d 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt @@ -32,6 +32,7 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.I <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; +import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionRequestBuilder())#> @@ -46,10 +47,22 @@ import <#=importNamespace#>.core.IBaseClient; super(requestUrl, client, requestOptions); } - public <#=c.ITypeCollectionRequest()#> buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List.options.Option> requestOptions) { return new <#=c.TypeCollectionRequest()#>(getRequestUrl(), getClient(), requestOptions); } diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt index 6e291f225..0986f470f 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt @@ -9,6 +9,7 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; +import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeCollectionWithReferencesRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionWithReferencesRequestBuilder())#> @@ -23,10 +24,22 @@ import <#=importNamespace#>.core.IBaseClient; super(requestUrl, client, requestOptions); } - public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List.options.Option> requestOptions) { return new <#=c.TypeCollectionWithReferencesRequest()#>(getRequestUrl(), getClient(), requestOptions); } diff --git a/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt index 30f53e892..fb3d49e8c 100644 --- a/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt @@ -10,6 +10,7 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; +import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeReferenceRequestBuilder())#> @@ -27,10 +28,11 @@ import <#=importNamespace#>.core.IBaseClient; /** * Creates the request * + * @param requestOptions the options for this request * @return The <#=c.ITypeReferenceRequest()#> instance */ - public <#=c.ITypeReferenceRequest()#> buildRequest() { - return buildRequest(getOptions()); + public <#=c.ITypeReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt index 815f8f4b4..3b6520008 100644 --- a/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt @@ -8,6 +8,7 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.core.IBaseClient; import <#=importNamespace#>.http.BaseRequestBuilder; +import java.util.Arrays; <# var mainNamespace = host.CurrentNamespace(); #> <#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), "BaseRequestBuilder", c.ITypeRequestBuilder())#> @@ -26,10 +27,11 @@ import <#=importNamespace#>.http.BaseRequestBuilder; /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeRequest()#> instance */ - public <#=c.ITypeRequest()#> buildRequest() { - return buildRequest(getOptions()); + public <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt index f8421e906..4d11692d8 100644 --- a/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt @@ -8,6 +8,7 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.core.IBaseClient; import <#=importNamespace#>.http.BaseRequestBuilder; +import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeStreamRequestBuilder(), "BaseRequestBuilder", c.ITypeStreamRequestBuilder())#> @@ -25,10 +26,11 @@ import <#=importNamespace#>.http.BaseRequestBuilder; /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeStreamRequest()#> instance */ - public <#=c.ITypeStreamRequest()#> buildRequest() { - return buildRequest(getOptions()); + public <#=c.ITypeStreamRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt index b3d0fc42a..239a5d904 100644 --- a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt @@ -9,6 +9,7 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; +import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeWithReferencesRequestBuilder(), "BaseRequestBuilder", c.ITypeWithReferencesRequestBuilder())#> @@ -26,10 +27,11 @@ import <#=importNamespace#>.core.IBaseClient; /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeWithReferencesRequest()#> instance */ - public <#=c.ITypeWithReferencesRequest()#> buildRequest() { - return buildRequest(getOptions()); + public <#=c.ITypeWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt index 24e5f8f1d..4622481c3 100644 --- a/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt @@ -14,6 +14,7 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo import <#=importNamespace#>.options.FunctionOption; import <#=importNamespace#>.core.IBaseClient; import <#=importNamespace#>.core.<#=c.GetMethodRequestBuilderSuperClass() #>; +import java.util.Arrays; <# bool isAction = !c.AsOdcmMethod().IsFunction; #> <#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequestBuilder(), c.GetMethodRequestBuilderSuperClass(), c.ITypeCollectionRequestBuilder())#> @@ -41,11 +42,23 @@ import <#=importNamespace#>.core.<#=c.GetMethodRequestBuilderSuperClass() #>; <# } #> } <# } #> - - public <#=c.ITypeCollectionRequest()#> buildRequest() { - return buildRequest(getOptions()); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List.options.Option> requestOptions) { <#= c.TypeCollectionRequest()#> request = new <#=c.TypeCollectionRequest()#>( getRequestUrl(), diff --git a/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt index 31b1e705f..08b6523d4 100644 --- a/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt @@ -10,6 +10,7 @@ import <#=importNamespace#>.core.BaseActionRequestBuilder; import <#=importNamespace#>.core.BaseFunctionRequestBuilder; import <#=importNamespace#>.core.IBaseClient; import com.google.gson.JsonElement; +import java.util.Arrays; <# bool isAction = !c.AsOdcmMethod().IsFunction; #> <#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), c.GetMethodRequestBuilderSuperClass(), c.ITypeRequestBuilder())#> @@ -37,10 +38,11 @@ import com.google.gson.JsonElement; /** * Creates the <#=c.ITypeRequest()#> * + * @param requestOptions the options for the request * @return the <#=c.ITypeRequest()#> instance */ - public <#=c.ITypeRequest()#> buildRequest() { - return buildRequest(getOptions()); + public <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt index ff3fb94fd..a5275db1f 100644 --- a/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt @@ -12,7 +12,19 @@ <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionReferenceRequestBuilder(), "IRequestBuilder")#> - <#=c.ITypeCollectionReferenceRequest()#> buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List.options.Option> requestOptions); } diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt index b95c327d0..1e118e21d 100644 --- a/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt @@ -36,8 +36,20 @@ import <#=importNamespace#>.http.IBaseCollectionPage; <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequestBuilder(), "IRequestBuilder")#> - <#=c.ITypeCollectionRequest()#> buildRequest(); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List.options.Option> requestOptions); <#=c.ITypeRequestBuilder()#> byId(final String id); diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequestBuilder.java.tt index 963cac9a5..b8910008e 100644 --- a/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequestBuilder.java.tt @@ -14,8 +14,20 @@ import <#=importNamespace#>.http.IHttpRequest; <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionWithReferencesRequestBuilder(), "IRequestBuilder")#> - <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List.options.Option> requestOptions); <#=c.ITypeWithReferencesRequestBuilder()#> byId(final String id); diff --git a/Templates/Java/requests_extensions/IBaseEntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityReferenceRequestBuilder.java.tt index 4966812c6..52f971a29 100644 --- a/Templates/Java/requests_extensions/IBaseEntityReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityReferenceRequestBuilder.java.tt @@ -15,9 +15,10 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>; /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeReferenceRequest()#> instance */ - <#=c.ITypeReferenceRequest()#> buildRequest(); + <#=c.ITypeReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt index 83c84d0cc..1fea8accf 100644 --- a/Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt @@ -11,9 +11,10 @@ /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeRequest()#> instance */ - <#=c.ITypeRequest()#> buildRequest(); + <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/Templates/Java/requests_extensions/IBaseEntityStreamRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityStreamRequestBuilder.java.tt index b3669dfca..f7473d5de 100644 --- a/Templates/Java/requests_extensions/IBaseEntityStreamRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityStreamRequestBuilder.java.tt @@ -14,9 +14,10 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeS /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeStreamRequest()#> instance */ - <#=c.ITypeStreamRequest()#> buildRequest(); + <#=c.ITypeStreamRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/Templates/Java/requests_extensions/IBaseEntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityWithReferenceRequestBuilder.java.tt index e837bf8f4..5c6293053 100644 --- a/Templates/Java/requests_extensions/IBaseEntityWithReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseEntityWithReferenceRequestBuilder.java.tt @@ -13,9 +13,10 @@ /** * Creates the request * + * @param requestOptions the options for this request * @return the <#=c.ITypeWithReferencesRequest()#> instance */ - <#=c.ITypeWithReferencesRequest()#> buildRequest(); + <#=c.ITypeWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/Templates/Java/requests_extensions/IBaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseMethodCollectionRequestBuilder.java.tt index 922abd0e4..a84c26390 100644 --- a/Templates/Java/requests_extensions/IBaseMethodCollectionRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseMethodCollectionRequestBuilder.java.tt @@ -15,8 +15,20 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeC <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequestBuilder(), "IRequestBuilder")#> - <#=c.ITypeCollectionRequest()#> buildRequest(); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List.options.Option> requestOptions); } diff --git a/Templates/Java/requests_extensions/IBaseMethodRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseMethodRequestBuilder.java.tt index b0098d312..2ec9a70de 100644 --- a/Templates/Java/requests_extensions/IBaseMethodRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/IBaseMethodRequestBuilder.java.tt @@ -13,9 +13,10 @@ import <#=importNamespace#>.http.IRequestBuilder; /** * Creates the <#=c.ITypeRequest()#> * + * @param requestOptions the options for the request * @return the <#=c.ITypeRequest()#> instance */ - <#=c.ITypeRequest()#> buildRequest(); + <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the <#=c.ITypeRequest()#> with specific options instead of the existing options From 35456e290748940a967df18ee3302850ec41919a Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 16 Sep 2020 10:44:05 -0400 Subject: [PATCH 2/4] - updates test files --- .../CallCollectionRequestBuilder.java | 17 +++++++++++++++-- .../CallReferenceRequestBuilder.java | 6 ++++-- .../extensions/CallRequestBuilder.java | 6 ++++-- .../CallWithReferenceRequestBuilder.java | 6 ++++-- .../CloudCommunicationsRequestBuilder.java | 6 ++++-- .../extensions/EndpointRequestBuilder.java | 6 ++++-- .../extensions/EntityRequestBuilder.java | 6 ++++-- .../EntityType2CollectionRequestBuilder.java | 17 +++++++++++++++-- .../EntityType2ReferenceRequestBuilder.java | 6 ++++-- .../extensions/EntityType2RequestBuilder.java | 6 ++++-- ...ntityType2WithReferenceRequestBuilder.java | 6 ++++-- ...ype3CollectionReferenceRequestBuilder.java | 17 +++++++++++++++-- .../EntityType3CollectionRequestBuilder.java | 17 +++++++++++++++-- ...ollectionWithReferencesRequestBuilder.java | 17 +++++++++++++++-- .../EntityType3ForwardRequestBuilder.java | 6 ++++-- .../EntityType3ReferenceRequestBuilder.java | 6 ++++-- .../extensions/EntityType3RequestBuilder.java | 6 ++++-- ...ntityType3WithReferenceRequestBuilder.java | 6 ++++-- .../ICallCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ICallReferenceRequestBuilder.java | 3 ++- .../extensions/ICallRequestBuilder.java | 3 ++- .../ICallWithReferenceRequestBuilder.java | 3 ++- .../ICloudCommunicationsRequestBuilder.java | 3 ++- .../extensions/IEndpointRequestBuilder.java | 3 ++- .../extensions/IEntityRequestBuilder.java | 3 ++- .../IEntityType2CollectionRequestBuilder.java | 16 ++++++++++++++-- .../IEntityType2ReferenceRequestBuilder.java | 3 ++- .../IEntityType2RequestBuilder.java | 3 ++- ...ntityType2WithReferenceRequestBuilder.java | 3 ++- ...ype3CollectionReferenceRequestBuilder.java | 16 ++++++++++++++-- .../IEntityType3CollectionRequestBuilder.java | 16 ++++++++++++++-- ...ollectionWithReferencesRequestBuilder.java | 16 ++++++++++++++-- .../IEntityType3ForwardRequestBuilder.java | 3 ++- .../IEntityType3ReferenceRequestBuilder.java | 3 ++- .../IEntityType3RequestBuilder.java | 3 ++- ...ntityType3WithReferenceRequestBuilder.java | 3 ++- ...nenotePageContentStreamRequestBuilder.java | 3 ++- .../IOnenotePageForwardRequestBuilder.java | 3 ++- .../IOnenotePageRequestBuilder.java | 3 ++- .../IPlannerGroupRequestBuilder.java | 3 ++- .../extensions/IScheduleRequestBuilder.java | 3 ++- .../ISingletonEntity1RequestBuilder.java | 3 ++- .../ISingletonEntity2RequestBuilder.java | 3 ++- .../extensions/ITestEntityRequestBuilder.java | 3 ++- ...TestTypeQueryCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ITestTypeReferenceRequestBuilder.java | 3 ++- .../extensions/ITestTypeRequestBuilder.java | 3 ++- .../ITestTypeWithReferenceRequestBuilder.java | 3 ++- .../ITimeOffCollectionRequestBuilder.java | 16 ++++++++++++++-- .../extensions/ITimeOffRequestBuilder.java | 3 ++- ...imeOffRequestCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ITimeOffRequestRequestBuilder.java | 3 ++- ...nenotePageContentStreamRequestBuilder.java | 6 ++++-- .../OnenotePageForwardRequestBuilder.java | 6 ++++-- .../extensions/OnenotePageRequestBuilder.java | 6 ++++-- .../PlannerGroupRequestBuilder.java | 6 ++++-- .../extensions/ScheduleRequestBuilder.java | 6 ++++-- .../SingletonEntity1RequestBuilder.java | 6 ++++-- .../SingletonEntity2RequestBuilder.java | 6 ++++-- .../extensions/TestEntityRequestBuilder.java | 6 ++++-- ...TestTypeQueryCollectionRequestBuilder.java | 19 ++++++++++++++++--- .../TestTypeReferenceRequestBuilder.java | 6 ++++-- .../extensions/TestTypeRequestBuilder.java | 6 ++++-- .../TestTypeWithReferenceRequestBuilder.java | 6 ++++-- .../TimeOffCollectionRequestBuilder.java | 17 +++++++++++++++-- .../extensions/TimeOffRequestBuilder.java | 6 ++++-- ...imeOffRequestCollectionRequestBuilder.java | 17 +++++++++++++++-- .../TimeOffRequestRequestBuilder.java | 6 ++++-- .../CallRecordCollectionRequestBuilder.java | 17 +++++++++++++++-- .../CallRecordItemRequestBuilder.java | 6 ++++-- .../extensions/CallRecordRequestBuilder.java | 6 ++++-- .../ICallRecordCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ICallRecordItemRequestBuilder.java | 3 ++- .../extensions/ICallRecordRequestBuilder.java | 3 ++- .../extensions/IOptionRequestBuilder.java | 3 ++- .../extensions/IPhotoRequestBuilder.java | 3 ++- .../IPhotoStreamRequestBuilder.java | 3 ++- .../ISegmentCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ISegmentForwardRequestBuilder.java | 3 ++- .../extensions/ISegmentRequestBuilder.java | 3 ++- ...entTestActionCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ISessionCollectionRequestBuilder.java | 16 ++++++++++++++-- .../ISessionReferenceRequestBuilder.java | 3 ++- .../extensions/ISessionRequestBuilder.java | 3 ++- .../ISessionWithReferenceRequestBuilder.java | 3 ++- .../ISingletonEntity1RequestBuilder.java | 3 ++- .../extensions/OptionRequestBuilder.java | 6 ++++-- .../extensions/PhotoRequestBuilder.java | 6 ++++-- .../extensions/PhotoStreamRequestBuilder.java | 6 ++++-- .../SegmentCollectionRequestBuilder.java | 17 +++++++++++++++-- .../SegmentForwardRequestBuilder.java | 6 ++++-- .../extensions/SegmentRequestBuilder.java | 6 ++++-- ...entTestActionCollectionRequestBuilder.java | 19 ++++++++++++++++--- .../SessionCollectionRequestBuilder.java | 17 +++++++++++++++-- .../SessionReferenceRequestBuilder.java | 6 ++++-- .../extensions/SessionRequestBuilder.java | 6 ++++-- .../SessionWithReferenceRequestBuilder.java | 6 ++++-- .../SingletonEntity1RequestBuilder.java | 6 ++++-- 98 files changed, 572 insertions(+), 161 deletions(-) diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java index f87fde9e7..5abdfeaf8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java @@ -17,6 +17,7 @@ import com.microsoft.graph.requests.extensions.ICallCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,22 @@ public CallCollectionRequestBuilder(final String requestUrl, final IBaseClient c super(requestUrl, client, requestOptions); } - public ICallCollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ICallCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ICallCollectionRequest buildRequest(final java.util.List requestOptions) { return new CallCollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java index 06cb01918..1edb7f1ad 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java @@ -14,6 +14,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public CallReferenceRequestBuilder(final String requestUrl, final IBaseClient cl /** * Creates the request * + * @param requestOptions the options for this request * @return The ICallReferenceRequest instance */ - public ICallReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public ICallReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java index 8e653d4e2..639a2461e 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public CallRequestBuilder(final String requestUrl, final IBaseClient client, fin /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallRequest instance */ - public ICallRequest buildRequest() { - return buildRequest(getOptions()); + public ICallRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java index 09bb4d4f6..b7bbb82bf 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java @@ -13,6 +13,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -35,10 +36,11 @@ public CallWithReferenceRequestBuilder(final String requestUrl, final IBaseClien /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallWithReferenceRequest instance */ - public ICallWithReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public ICallWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java index ae85a2e29..b5e86c308 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java @@ -20,6 +20,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -42,10 +43,11 @@ public CloudCommunicationsRequestBuilder(final String requestUrl, final IBaseCli /** * Creates the request * + * @param requestOptions the options for this request * @return the ICloudCommunicationsRequest instance */ - public ICloudCommunicationsRequest buildRequest() { - return buildRequest(getOptions()); + public ICloudCommunicationsRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java index 66bfc0bcc..8adf4f31a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public EndpointRequestBuilder(final String requestUrl, final IBaseClient client, /** * Creates the request * + * @param requestOptions the options for this request * @return the IEndpointRequest instance */ - public IEndpointRequest buildRequest() { - return buildRequest(getOptions()); + public IEndpointRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java index dce5bd1aa..8c67b480d 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public EntityRequestBuilder(final String requestUrl, final IBaseClient client, f /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityRequest instance */ - public IEntityRequest buildRequest() { - return buildRequest(getOptions()); + public IEntityRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java index 70b034873..297c11c56 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java @@ -17,6 +17,7 @@ import com.microsoft.graph.requests.extensions.IEntityType2CollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,22 @@ public EntityType2CollectionRequestBuilder(final String requestUrl, final IBaseC super(requestUrl, client, requestOptions); } - public IEntityType2CollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public IEntityType2CollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public IEntityType2CollectionRequest buildRequest(final java.util.List requestOptions) { return new EntityType2CollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java index 818ca0e64..6cb1fcf07 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java @@ -14,6 +14,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public EntityType2ReferenceRequestBuilder(final String requestUrl, final IBaseCl /** * Creates the request * + * @param requestOptions the options for this request * @return The IEntityType2ReferenceRequest instance */ - public IEntityType2ReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public IEntityType2ReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java index 18fa1eec7..b7009f6af 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public EntityType2RequestBuilder(final String requestUrl, final IBaseClient clie /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType2Request instance */ - public IEntityType2Request buildRequest() { - return buildRequest(getOptions()); + public IEntityType2Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java index 0f8b77fbe..3a5dd917d 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java @@ -13,6 +13,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -35,10 +36,11 @@ public EntityType2WithReferenceRequestBuilder(final String requestUrl, final IBa /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType2WithReferenceRequest instance */ - public IEntityType2WithReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public IEntityType2WithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java index c98a76395..da7ebe832 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java @@ -16,6 +16,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -35,10 +36,22 @@ public EntityType3CollectionReferenceRequestBuilder(final String requestUrl, fin super(requestUrl, client, requestOptions); } - public IEntityType3CollectionReferenceRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public IEntityType3CollectionReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public IEntityType3CollectionReferenceRequest buildRequest(final java.util.List requestOptions) { return new EntityType3CollectionReferenceRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java index 1c7d72b24..463137984 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java @@ -18,6 +18,7 @@ import com.microsoft.graph.requests.extensions.IEntityType3CollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -37,10 +38,22 @@ public EntityType3CollectionRequestBuilder(final String requestUrl, final IBaseC super(requestUrl, client, requestOptions); } - public IEntityType3CollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public IEntityType3CollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public IEntityType3CollectionRequest buildRequest(final java.util.List requestOptions) { return new EntityType3CollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java index 7e057d8b0..fc1b2cad5 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java @@ -16,6 +16,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -35,10 +36,22 @@ public EntityType3CollectionWithReferencesRequestBuilder(final String requestUrl super(requestUrl, client, requestOptions); } - public IEntityType3CollectionWithReferencesRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public IEntityType3CollectionWithReferencesRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public IEntityType3CollectionWithReferencesRequest buildRequest(final java.util.List requestOptions) { return new EntityType3CollectionWithReferencesRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java index 99a0072a8..46546d898 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java @@ -11,6 +11,7 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,10 +44,11 @@ public EntityType3ForwardRequestBuilder(final String requestUrl, final IBaseClie /** * Creates the IEntityType3ForwardRequest * + * @param requestOptions the options for the request * @return the IEntityType3ForwardRequest instance */ - public IEntityType3ForwardRequest buildRequest() { - return buildRequest(getOptions()); + public IEntityType3ForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java index 2cca88c5d..13c65e5e0 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java @@ -16,6 +16,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -38,10 +39,11 @@ public EntityType3ReferenceRequestBuilder(final String requestUrl, final IBaseCl /** * Creates the request * + * @param requestOptions the options for this request * @return The IEntityType3ReferenceRequest instance */ - public IEntityType3ReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public IEntityType3ReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java index 9f43433a3..feb508705 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java @@ -14,6 +14,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public EntityType3RequestBuilder(final String requestUrl, final IBaseClient clie /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType3Request instance */ - public IEntityType3Request buildRequest() { - return buildRequest(getOptions()); + public IEntityType3Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java index 2f82e09e9..087d8e97a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java @@ -15,6 +15,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -37,10 +38,11 @@ public EntityType3WithReferenceRequestBuilder(final String requestUrl, final IBa /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType3WithReferenceRequest instance */ - public IEntityType3WithReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public IEntityType3WithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallCollectionRequestBuilder.java index 59c7c1aeb..98bc10031 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallCollectionRequestBuilder.java @@ -23,8 +23,20 @@ */ public interface ICallCollectionRequestBuilder extends IRequestBuilder { - ICallCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ICallCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ICallCollectionRequest buildRequest(final java.util.List requestOptions); ICallRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallReferenceRequestBuilder.java index bf7b10230..ffe9da943 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallReferenceRequestBuilder.java @@ -23,9 +23,10 @@ public interface ICallReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallReferenceRequest instance */ - ICallReferenceRequest buildRequest(); + ICallReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallRequestBuilder.java index edc0ad094..e7ffc772f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallRequestBuilder.java @@ -20,9 +20,10 @@ public interface ICallRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallRequest instance */ - ICallRequest buildRequest(); + ICallRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallWithReferenceRequestBuilder.java index 0313d7352..994578689 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallWithReferenceRequestBuilder.java @@ -22,9 +22,10 @@ public interface ICallWithReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallWithReferenceRequest instance */ - ICallWithReferenceRequest buildRequest(); + ICallWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICloudCommunicationsRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICloudCommunicationsRequestBuilder.java index 3c3962027..3c5a16edd 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICloudCommunicationsRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICloudCommunicationsRequestBuilder.java @@ -24,9 +24,10 @@ public interface ICloudCommunicationsRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ICloudCommunicationsRequest instance */ - ICloudCommunicationsRequest buildRequest(); + ICloudCommunicationsRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEndpointRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEndpointRequestBuilder.java index 504130f01..2b540bc3c 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEndpointRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEndpointRequestBuilder.java @@ -20,9 +20,10 @@ public interface IEndpointRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IEndpointRequest instance */ - IEndpointRequest buildRequest(); + IEndpointRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityRequestBuilder.java index d3525385c..fb1ebce8f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityRequestBuilder.java @@ -20,9 +20,10 @@ public interface IEntityRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityRequest instance */ - IEntityRequest buildRequest(); + IEntityRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2CollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2CollectionRequestBuilder.java index dfa8721c4..52a7d09c5 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2CollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2CollectionRequestBuilder.java @@ -23,8 +23,20 @@ */ public interface IEntityType2CollectionRequestBuilder extends IRequestBuilder { - IEntityType2CollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + IEntityType2CollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ IEntityType2CollectionRequest buildRequest(final java.util.List requestOptions); IEntityType2RequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2ReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2ReferenceRequestBuilder.java index fe66567c6..1b178ec3d 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2ReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2ReferenceRequestBuilder.java @@ -23,9 +23,10 @@ public interface IEntityType2ReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType2ReferenceRequest instance */ - IEntityType2ReferenceRequest buildRequest(); + IEntityType2ReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2RequestBuilder.java index 062c14c4e..66c6f8b28 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2RequestBuilder.java @@ -20,9 +20,10 @@ public interface IEntityType2RequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType2Request instance */ - IEntityType2Request buildRequest(); + IEntityType2Request buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2WithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2WithReferenceRequestBuilder.java index 4400d5c5e..caba9a302 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2WithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2WithReferenceRequestBuilder.java @@ -22,9 +22,10 @@ public interface IEntityType2WithReferenceRequestBuilder extends IRequestBuilder /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType2WithReferenceRequest instance */ - IEntityType2WithReferenceRequest buildRequest(); + IEntityType2WithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionReferenceRequestBuilder.java index 82c1dab82..a2ee1d683 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionReferenceRequestBuilder.java @@ -21,7 +21,19 @@ */ public interface IEntityType3CollectionReferenceRequestBuilder extends IRequestBuilder { - IEntityType3CollectionReferenceRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + IEntityType3CollectionReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ IEntityType3CollectionReferenceRequest buildRequest(final java.util.List requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionRequestBuilder.java index 4ba4ea7ed..c5bff2ce8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionRequestBuilder.java @@ -24,8 +24,20 @@ */ public interface IEntityType3CollectionRequestBuilder extends IRequestBuilder { - IEntityType3CollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + IEntityType3CollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ IEntityType3CollectionRequest buildRequest(final java.util.List requestOptions); IEntityType3RequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionWithReferencesRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionWithReferencesRequestBuilder.java index 82018db17..4b66f530c 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionWithReferencesRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionWithReferencesRequestBuilder.java @@ -23,8 +23,20 @@ */ public interface IEntityType3CollectionWithReferencesRequestBuilder extends IRequestBuilder { - IEntityType3CollectionWithReferencesRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + IEntityType3CollectionWithReferencesRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ IEntityType3CollectionWithReferencesRequest buildRequest(final java.util.List requestOptions); IEntityType3WithReferenceRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ForwardRequestBuilder.java index 7f342fdfd..46807b74f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ForwardRequestBuilder.java @@ -17,9 +17,10 @@ public interface IEntityType3ForwardRequestBuilder extends IRequestBuilder { /** * Creates the IEntityType3ForwardRequest * + * @param requestOptions the options for the request * @return the IEntityType3ForwardRequest instance */ - IEntityType3ForwardRequest buildRequest(); + IEntityType3ForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the IEntityType3ForwardRequest with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ReferenceRequestBuilder.java index 799ad39ea..0400eeed7 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ReferenceRequestBuilder.java @@ -25,9 +25,10 @@ public interface IEntityType3ReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType3ReferenceRequest instance */ - IEntityType3ReferenceRequest buildRequest(); + IEntityType3ReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3RequestBuilder.java index 6c827df23..32b22caa9 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3RequestBuilder.java @@ -22,9 +22,10 @@ public interface IEntityType3RequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType3Request instance */ - IEntityType3Request buildRequest(); + IEntityType3Request buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3WithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3WithReferenceRequestBuilder.java index 3cf0c51cb..825bb1190 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3WithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3WithReferenceRequestBuilder.java @@ -24,9 +24,10 @@ public interface IEntityType3WithReferenceRequestBuilder extends IRequestBuilder /** * Creates the request * + * @param requestOptions the options for this request * @return the IEntityType3WithReferenceRequest instance */ - IEntityType3WithReferenceRequest buildRequest(); + IEntityType3WithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageContentStreamRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageContentStreamRequestBuilder.java index a14628378..0907bdb05 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageContentStreamRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageContentStreamRequestBuilder.java @@ -22,9 +22,10 @@ public interface IOnenotePageContentStreamRequestBuilder extends IRequestBuilder /** * Creates the request * + * @param requestOptions the options for this request * @return the IOnenotePageContentStreamRequest instance */ - IOnenotePageContentStreamRequest buildRequest(); + IOnenotePageContentStreamRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageForwardRequestBuilder.java index e3dfd20c2..3ba415962 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageForwardRequestBuilder.java @@ -17,9 +17,10 @@ public interface IOnenotePageForwardRequestBuilder extends IRequestBuilder { /** * Creates the IOnenotePageForwardRequest * + * @param requestOptions the options for the request * @return the IOnenotePageForwardRequest instance */ - IOnenotePageForwardRequest buildRequest(); + IOnenotePageForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the IOnenotePageForwardRequest with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageRequestBuilder.java index 6012f6071..6f06df638 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IOnenotePageRequestBuilder.java @@ -21,9 +21,10 @@ public interface IOnenotePageRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IOnenotePageRequest instance */ - IOnenotePageRequest buildRequest(); + IOnenotePageRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IPlannerGroupRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IPlannerGroupRequestBuilder.java index ebbf99ca3..14cf1209f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IPlannerGroupRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IPlannerGroupRequestBuilder.java @@ -20,9 +20,10 @@ public interface IPlannerGroupRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IPlannerGroupRequest instance */ - IPlannerGroupRequest buildRequest(); + IPlannerGroupRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IScheduleRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IScheduleRequestBuilder.java index 45872e61f..542bdfe1f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IScheduleRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IScheduleRequestBuilder.java @@ -24,9 +24,10 @@ public interface IScheduleRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IScheduleRequest instance */ - IScheduleRequest buildRequest(); + IScheduleRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity1RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity1RequestBuilder.java index 16af8fe3c..e2843d60f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity1RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity1RequestBuilder.java @@ -21,9 +21,10 @@ public interface ISingletonEntity1RequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISingletonEntity1Request instance */ - ISingletonEntity1Request buildRequest(); + ISingletonEntity1Request buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity2RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity2RequestBuilder.java index 5e6f84b0f..db8591a1b 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity2RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ISingletonEntity2RequestBuilder.java @@ -21,9 +21,10 @@ public interface ISingletonEntity2RequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISingletonEntity2Request instance */ - ISingletonEntity2Request buildRequest(); + ISingletonEntity2Request buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestEntityRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestEntityRequestBuilder.java index 7f3492a75..ff1eeffbd 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestEntityRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestEntityRequestBuilder.java @@ -23,9 +23,10 @@ public interface ITestEntityRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestEntityRequest instance */ - ITestEntityRequest buildRequest(); + ITestEntityRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeQueryCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeQueryCollectionRequestBuilder.java index c9541c14d..b53585fca 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeQueryCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeQueryCollectionRequestBuilder.java @@ -21,8 +21,20 @@ */ public interface ITestTypeQueryCollectionRequestBuilder extends IRequestBuilder { - ITestTypeQueryCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ITestTypeQueryCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ITestTypeQueryCollectionRequest buildRequest(final java.util.List requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeReferenceRequestBuilder.java index 24014e76e..9a18cd267 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeReferenceRequestBuilder.java @@ -25,9 +25,10 @@ public interface ITestTypeReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestTypeReferenceRequest instance */ - ITestTypeReferenceRequest buildRequest(); + ITestTypeReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeRequestBuilder.java index a437e2c2d..c259ac3a1 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeRequestBuilder.java @@ -22,9 +22,10 @@ public interface ITestTypeRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestTypeRequest instance */ - ITestTypeRequest buildRequest(); + ITestTypeRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeWithReferenceRequestBuilder.java index d62a60591..8dd6e8bb7 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITestTypeWithReferenceRequestBuilder.java @@ -24,9 +24,10 @@ public interface ITestTypeWithReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestTypeWithReferenceRequest instance */ - ITestTypeWithReferenceRequest buildRequest(); + ITestTypeWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffCollectionRequestBuilder.java index f842982e4..18df4e33f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffCollectionRequestBuilder.java @@ -23,8 +23,20 @@ */ public interface ITimeOffCollectionRequestBuilder extends IRequestBuilder { - ITimeOffCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ITimeOffCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ITimeOffCollectionRequest buildRequest(final java.util.List requestOptions); ITimeOffRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestBuilder.java index 782f321c1..cccf55b8e 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestBuilder.java @@ -20,9 +20,10 @@ public interface ITimeOffRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ITimeOffRequest instance */ - ITimeOffRequest buildRequest(); + ITimeOffRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestCollectionRequestBuilder.java index 2bea0cc24..143344567 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestCollectionRequestBuilder.java @@ -24,8 +24,20 @@ */ public interface ITimeOffRequestCollectionRequestBuilder extends IRequestBuilder { - ITimeOffRequestCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ITimeOffRequestCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ITimeOffRequestCollectionRequest buildRequest(final java.util.List requestOptions); ITimeOffRequestRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestRequestBuilder.java index 3a2d2ed0e..ed7aee545 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ITimeOffRequestRequestBuilder.java @@ -20,9 +20,10 @@ public interface ITimeOffRequestRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ITimeOffRequestRequest instance */ - ITimeOffRequestRequest buildRequest(); + ITimeOffRequestRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java index 4656fd0c8..a681fd557 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public OnenotePageContentStreamRequestBuilder(final String requestUrl, final IBa /** * Creates the request * + * @param requestOptions the options for this request * @return the IOnenotePageContentStreamRequest instance */ - public IOnenotePageContentStreamRequest buildRequest() { - return buildRequest(getOptions()); + public IOnenotePageContentStreamRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java index 17bf99b45..39c860943 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java @@ -11,6 +11,7 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -53,10 +54,11 @@ public OnenotePageForwardRequestBuilder(final String requestUrl, final IBaseClie /** * Creates the IOnenotePageForwardRequest * + * @param requestOptions the options for the request * @return the IOnenotePageForwardRequest instance */ - public IOnenotePageForwardRequest buildRequest() { - return buildRequest(getOptions()); + public IOnenotePageForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java index 0ea1c577a..57e0255ba 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java @@ -13,6 +13,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -35,10 +36,11 @@ public OnenotePageRequestBuilder(final String requestUrl, final IBaseClient clie /** * Creates the request * + * @param requestOptions the options for this request * @return the IOnenotePageRequest instance */ - public IOnenotePageRequest buildRequest() { - return buildRequest(getOptions()); + public IOnenotePageRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java index 7a537904a..7258f1bd8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public PlannerGroupRequestBuilder(final String requestUrl, final IBaseClient cli /** * Creates the request * + * @param requestOptions the options for this request * @return the IPlannerGroupRequest instance */ - public IPlannerGroupRequest buildRequest() { - return buildRequest(getOptions()); + public IPlannerGroupRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java index 9b05847a7..6b23c5b8f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java @@ -20,6 +20,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -42,10 +43,11 @@ public ScheduleRequestBuilder(final String requestUrl, final IBaseClient client, /** * Creates the request * + * @param requestOptions the options for this request * @return the IScheduleRequest instance */ - public IScheduleRequest buildRequest() { - return buildRequest(getOptions()); + public IScheduleRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java index 8677744c1..28ee2489d 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java @@ -14,6 +14,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public SingletonEntity1RequestBuilder(final String requestUrl, final IBaseClient /** * Creates the request * + * @param requestOptions the options for this request * @return the ISingletonEntity1Request instance */ - public ISingletonEntity1Request buildRequest() { - return buildRequest(getOptions()); + public ISingletonEntity1Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java index bddde6df5..35125d958 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java @@ -14,6 +14,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public SingletonEntity2RequestBuilder(final String requestUrl, final IBaseClient /** * Creates the request * + * @param requestOptions the options for this request * @return the ISingletonEntity2Request instance */ - public ISingletonEntity2Request buildRequest() { - return buildRequest(getOptions()); + public ISingletonEntity2Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java index 94a2c5f6e..6d6b8e2c2 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java @@ -18,6 +18,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,10 +41,11 @@ public TestEntityRequestBuilder(final String requestUrl, final IBaseClient clien /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestEntityRequest instance */ - public ITestEntityRequest buildRequest() { - return buildRequest(getOptions()); + public ITestEntityRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java index 83a2d1730..49d4cc241 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java @@ -18,6 +18,7 @@ import com.microsoft.graph.options.FunctionOption; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.core.BaseActionRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,11 +41,23 @@ public TestTypeQueryCollectionRequestBuilder(final String requestUrl, final IBas bodyParams.put("requests", requests); } } - - public ITestTypeQueryCollectionRequest buildRequest() { - return buildRequest(getOptions()); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ITestTypeQueryCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ITestTypeQueryCollectionRequest buildRequest(final java.util.List requestOptions) { TestTypeQueryCollectionRequest request = new TestTypeQueryCollectionRequest( getRequestUrl(), diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java index 9559639a4..02f155a69 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java @@ -16,6 +16,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -38,10 +39,11 @@ public TestTypeReferenceRequestBuilder(final String requestUrl, final IBaseClien /** * Creates the request * + * @param requestOptions the options for this request * @return The ITestTypeReferenceRequest instance */ - public ITestTypeReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public ITestTypeReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java index 198557317..2e13c5208 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java @@ -14,6 +14,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public TestTypeRequestBuilder(final String requestUrl, final IBaseClient client, /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestTypeRequest instance */ - public ITestTypeRequest buildRequest() { - return buildRequest(getOptions()); + public ITestTypeRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java index 78f5677c3..deb0dc7ae 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java @@ -15,6 +15,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -37,10 +38,11 @@ public TestTypeWithReferenceRequestBuilder(final String requestUrl, final IBaseC /** * Creates the request * + * @param requestOptions the options for this request * @return the ITestTypeWithReferenceRequest instance */ - public ITestTypeWithReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public ITestTypeWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java index b3a0961ec..57128b658 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java @@ -17,6 +17,7 @@ import com.microsoft.graph.requests.extensions.ITimeOffCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,22 @@ public TimeOffCollectionRequestBuilder(final String requestUrl, final IBaseClien super(requestUrl, client, requestOptions); } - public ITimeOffCollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ITimeOffCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ITimeOffCollectionRequest buildRequest(final java.util.List requestOptions) { return new TimeOffCollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java index 39def036a..09ac4c0b3 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public TimeOffRequestBuilder(final String requestUrl, final IBaseClient client, /** * Creates the request * + * @param requestOptions the options for this request * @return the ITimeOffRequest instance */ - public ITimeOffRequest buildRequest() { - return buildRequest(getOptions()); + public ITimeOffRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java index e62859b3e..20f732fd2 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java @@ -18,6 +18,7 @@ import com.microsoft.graph.requests.extensions.ITimeOffRequestCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -37,10 +38,22 @@ public TimeOffRequestCollectionRequestBuilder(final String requestUrl, final IBa super(requestUrl, client, requestOptions); } - public ITimeOffRequestCollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ITimeOffRequestCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ITimeOffRequestCollectionRequest buildRequest(final java.util.List requestOptions) { return new TimeOffRequestCollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java index 3b8f58ff9..d993c385d 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public TimeOffRequestRequestBuilder(final String requestUrl, final IBaseClient c /** * Creates the request * + * @param requestOptions the options for this request * @return the ITimeOffRequestRequest instance */ - public ITimeOffRequestRequest buildRequest() { - return buildRequest(getOptions()); + public ITimeOffRequestRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java index 746ca7ff8..2c5f4b588 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java @@ -18,6 +18,7 @@ import com.microsoft.graph2.callrecords.requests.extensions.ICallRecordItemRequestBuilder; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -37,10 +38,22 @@ public CallRecordCollectionRequestBuilder(final String requestUrl, final IBaseCl super(requestUrl, client, requestOptions); } - public ICallRecordCollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ICallRecordCollectionRequest buildRequest(final java.util.List requestOptions) { return new CallRecordCollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java index ee4f46f03..4da4d3bc2 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java @@ -10,6 +10,7 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public CallRecordItemRequestBuilder(final String requestUrl, final IBaseClient c /** * Creates the ICallRecordItemRequest * + * @param requestOptions the options for the request * @return the ICallRecordItemRequest instance */ - public ICallRecordItemRequest buildRequest() { - return buildRequest(getOptions()); + public ICallRecordItemRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java index 5f3276fb7..f99ad4f7a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java @@ -20,6 +20,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -42,10 +43,11 @@ public CallRecordRequestBuilder(final String requestUrl, final IBaseClient clien /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallRecordRequest instance */ - public ICallRecordRequest buildRequest() { - return buildRequest(getOptions()); + public ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordCollectionRequestBuilder.java index b84c02678..f929f85c8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordCollectionRequestBuilder.java @@ -24,8 +24,20 @@ */ public interface ICallRecordCollectionRequestBuilder extends IRequestBuilder { - ICallRecordCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ICallRecordCollectionRequest buildRequest(final java.util.List requestOptions); ICallRecordRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordItemRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordItemRequestBuilder.java index a53ce54a0..6a3d48bfb 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordItemRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordItemRequestBuilder.java @@ -17,9 +17,10 @@ public interface ICallRecordItemRequestBuilder extends IRequestBuilder { /** * Creates the ICallRecordItemRequest * + * @param requestOptions the options for the request * @return the ICallRecordItemRequest instance */ - ICallRecordItemRequest buildRequest(); + ICallRecordItemRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the ICallRecordItemRequest with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordRequestBuilder.java index e7031ea7b..259fe9f95 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ICallRecordRequestBuilder.java @@ -24,9 +24,10 @@ public interface ICallRecordRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ICallRecordRequest instance */ - ICallRecordRequest buildRequest(); + ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IOptionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IOptionRequestBuilder.java index 4c12e696e..eaea71fa2 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IOptionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IOptionRequestBuilder.java @@ -20,9 +20,10 @@ public interface IOptionRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IOptionRequest instance */ - IOptionRequest buildRequest(); + IOptionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoRequestBuilder.java index ba5f8e392..92db32dca 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoRequestBuilder.java @@ -20,9 +20,10 @@ public interface IPhotoRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IPhotoRequest instance */ - IPhotoRequest buildRequest(); + IPhotoRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoStreamRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoStreamRequestBuilder.java index 192a68d40..60412057e 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoStreamRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/IPhotoStreamRequestBuilder.java @@ -22,9 +22,10 @@ public interface IPhotoStreamRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the IPhotoStreamRequest instance */ - IPhotoStreamRequest buildRequest(); + IPhotoStreamRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentCollectionRequestBuilder.java index 5f5a87c4e..7dfed2778 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentCollectionRequestBuilder.java @@ -25,8 +25,20 @@ */ public interface ISegmentCollectionRequestBuilder extends IRequestBuilder { - ISegmentCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ISegmentCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ISegmentCollectionRequest buildRequest(final java.util.List requestOptions); ISegmentRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentForwardRequestBuilder.java index ba13fa5ce..a15aceace 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentForwardRequestBuilder.java @@ -17,9 +17,10 @@ public interface ISegmentForwardRequestBuilder extends IRequestBuilder { /** * Creates the ISegmentForwardRequest * + * @param requestOptions the options for the request * @return the ISegmentForwardRequest instance */ - ISegmentForwardRequest buildRequest(); + ISegmentForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the ISegmentForwardRequest with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentRequestBuilder.java index a6b460525..7d95e167e 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentRequestBuilder.java @@ -28,9 +28,10 @@ public interface ISegmentRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISegmentRequest instance */ - ISegmentRequest buildRequest(); + ISegmentRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentTestActionCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentTestActionCollectionRequestBuilder.java index fef71e287..32ff13ba5 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentTestActionCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISegmentTestActionCollectionRequestBuilder.java @@ -21,8 +21,20 @@ */ public interface ISegmentTestActionCollectionRequestBuilder extends IRequestBuilder { - ISegmentTestActionCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ISegmentTestActionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ISegmentTestActionCollectionRequest buildRequest(final java.util.List requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionCollectionRequestBuilder.java index 77462a4c2..e95f8b1fd 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionCollectionRequestBuilder.java @@ -23,8 +23,20 @@ */ public interface ISessionCollectionRequestBuilder extends IRequestBuilder { - ISessionCollectionRequest buildRequest(); - + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + ISessionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ ISessionCollectionRequest buildRequest(final java.util.List requestOptions); ISessionRequestBuilder byId(final String id); diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionReferenceRequestBuilder.java index 1dfac9a44..319249947 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionReferenceRequestBuilder.java @@ -25,9 +25,10 @@ public interface ISessionReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISessionReferenceRequest instance */ - ISessionReferenceRequest buildRequest(); + ISessionReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionRequestBuilder.java index d2839cb11..ec6e8bec0 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionRequestBuilder.java @@ -22,9 +22,10 @@ public interface ISessionRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISessionRequest instance */ - ISessionRequest buildRequest(); + ISessionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionWithReferenceRequestBuilder.java index aef112241..9168fa9d2 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISessionWithReferenceRequestBuilder.java @@ -24,9 +24,10 @@ public interface ISessionWithReferenceRequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISessionWithReferenceRequest instance */ - ISessionWithReferenceRequest buildRequest(); + ISessionWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISingletonEntity1RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISingletonEntity1RequestBuilder.java index cdac5dc32..617c50bec 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISingletonEntity1RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/ISingletonEntity1RequestBuilder.java @@ -21,9 +21,10 @@ public interface ISingletonEntity1RequestBuilder extends IRequestBuilder { /** * Creates the request * + * @param requestOptions the options for this request * @return the ISingletonEntity1Request instance */ - ISingletonEntity1Request buildRequest(); + ISingletonEntity1Request buildRequest(final com.microsoft.graph.options.Option... requestOptions); /** * Creates the request with specific options instead of the existing options diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java index 3ae4937cf..8a99b4f95 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public OptionRequestBuilder(final String requestUrl, final IBaseClient client, f /** * Creates the request * + * @param requestOptions the options for this request * @return the IOptionRequest instance */ - public IOptionRequest buildRequest() { - return buildRequest(getOptions()); + public IOptionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java index d4e082348..c5bbad087 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public PhotoRequestBuilder(final String requestUrl, final IBaseClient client, fi /** * Creates the request * + * @param requestOptions the options for this request * @return the IPhotoRequest instance */ - public IPhotoRequest buildRequest() { - return buildRequest(getOptions()); + public IPhotoRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java index 39bc9cd50..e7d03c591 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -34,10 +35,11 @@ public PhotoStreamRequestBuilder(final String requestUrl, final IBaseClient clie /** * Creates the request * + * @param requestOptions the options for this request * @return the IPhotoStreamRequest instance */ - public IPhotoStreamRequest buildRequest() { - return buildRequest(getOptions()); + public IPhotoStreamRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java index 310fc64c1..f0124ddfc 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java @@ -19,6 +19,7 @@ import com.microsoft.graph2.callrecords.requests.extensions.ISegmentCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -38,10 +39,22 @@ public SegmentCollectionRequestBuilder(final String requestUrl, final IBaseClien super(requestUrl, client, requestOptions); } - public ISegmentCollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ISegmentCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ISegmentCollectionRequest buildRequest(final java.util.List requestOptions) { return new SegmentCollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java index 9b3deadee..7203ba4b0 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java @@ -11,6 +11,7 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,10 +44,11 @@ public SegmentForwardRequestBuilder(final String requestUrl, final IBaseClient c /** * Creates the ISegmentForwardRequest * + * @param requestOptions the options for the request * @return the ISegmentForwardRequest instance */ - public ISegmentForwardRequest buildRequest() { - return buildRequest(getOptions()); + public ISegmentForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java index a84d9bacb..4c24e3be5 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java @@ -25,6 +25,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -47,10 +48,11 @@ public SegmentRequestBuilder(final String requestUrl, final IBaseClient client, /** * Creates the request * + * @param requestOptions the options for this request * @return the ISegmentRequest instance */ - public ISegmentRequest buildRequest() { - return buildRequest(getOptions()); + public ISegmentRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java index 4782dd1cd..dacead801 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java @@ -18,6 +18,7 @@ import com.microsoft.graph.options.FunctionOption; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.core.BaseActionRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,11 +41,23 @@ public SegmentTestActionCollectionRequestBuilder(final String requestUrl, final bodyParams.put("value", value); } } - - public ISegmentTestActionCollectionRequest buildRequest() { - return buildRequest(getOptions()); + + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ISegmentTestActionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ISegmentTestActionCollectionRequest buildRequest(final java.util.List requestOptions) { SegmentTestActionCollectionRequest request = new SegmentTestActionCollectionRequest( getRequestUrl(), diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java index 8ecf250ac..44b2d99d5 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java @@ -17,6 +17,7 @@ import com.microsoft.graph2.callrecords.requests.extensions.ISessionCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,22 @@ public SessionCollectionRequestBuilder(final String requestUrl, final IBaseClien super(requestUrl, client, requestOptions); } - public ISessionCollectionRequest buildRequest() { - return buildRequest(getOptions()); + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ + public ISessionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } + /** + * Creates the request + * + * @param requestOptions the options for this request + * @return the IUserRequest instance + */ public ISessionCollectionRequest buildRequest(final java.util.List requestOptions) { return new SessionCollectionRequest(getRequestUrl(), getClient(), requestOptions); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java index 4481d5fa3..e520fa4c6 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java @@ -18,6 +18,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,10 +41,11 @@ public SessionReferenceRequestBuilder(final String requestUrl, final IBaseClient /** * Creates the request * + * @param requestOptions the options for this request * @return The ISessionReferenceRequest instance */ - public ISessionReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public ISessionReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java index 9634047e9..c6d68fd47 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java @@ -16,6 +16,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -38,10 +39,11 @@ public SessionRequestBuilder(final String requestUrl, final IBaseClient client, /** * Creates the request * + * @param requestOptions the options for this request * @return the ISessionRequest instance */ - public ISessionRequest buildRequest() { - return buildRequest(getOptions()); + public ISessionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java index c7425be8f..84168aea1 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java @@ -17,6 +17,7 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,10 +40,11 @@ public SessionWithReferenceRequestBuilder(final String requestUrl, final IBaseCl /** * Creates the request * + * @param requestOptions the options for this request * @return the ISessionWithReferenceRequest instance */ - public ISessionWithReferenceRequest buildRequest() { - return buildRequest(getOptions()); + public ISessionWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java index 6a8f6369b..5ca7ab4ba 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java @@ -14,6 +14,7 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; +import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -36,10 +37,11 @@ public SingletonEntity1RequestBuilder(final String requestUrl, final IBaseClient /** * Creates the request * + * @param requestOptions the options for this request * @return the ISingletonEntity1Request instance */ - public ISingletonEntity1Request buildRequest() { - return buildRequest(getOptions()); + public ISingletonEntity1Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { + return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); } /** From c107eb70d461e946852a019ccaeb3a1704c35da8 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 16 Sep 2020 15:24:31 -0400 Subject: [PATCH 3/4] - refactors vararg implementation to reduce the amount of generated code --- .../BaseEntityCollectionReferenceRequestBuilder.java.tt | 3 +-- .../BaseEntityCollectionRequestBuilder.java.tt | 3 +-- .../BaseEntityCollectionWithReferencesRequestBuilder.java.tt | 3 +-- .../BaseEntityReferenceRequestBuilder.java.tt | 3 +-- .../Java/requests_extensions/BaseEntityRequestBuilder.java.tt | 3 +-- .../requests_extensions/BaseEntityStreamRequestBuilder.java.tt | 3 +-- .../BaseEntityWithReferenceRequestBuilder.java.tt | 3 +-- .../BaseMethodCollectionRequestBuilder.java.tt | 3 +-- .../Java/requests_extensions/BaseMethodRequestBuilder.java.tt | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt index a9e655975..a387cc180 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt @@ -9,7 +9,6 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; -import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionReferenceRequestBuilder())#> @@ -31,7 +30,7 @@ import java.util.Arrays; * @return the IUserRequest instance */ public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt index 82b3a5f7d..39732c55a 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt @@ -32,7 +32,6 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.I <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; -import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionRequestBuilder())#> @@ -54,7 +53,7 @@ import java.util.Arrays; * @return the IUserRequest instance */ public <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt index 0986f470f..be22e94fc 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt @@ -9,7 +9,6 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; -import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeCollectionWithReferencesRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionWithReferencesRequestBuilder())#> @@ -31,7 +30,7 @@ import java.util.Arrays; * @return the IUserRequest instance */ public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt index fb3d49e8c..b98716552 100644 --- a/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt @@ -10,7 +10,6 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; -import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeReferenceRequestBuilder())#> @@ -32,7 +31,7 @@ import java.util.Arrays; * @return The <#=c.ITypeReferenceRequest()#> instance */ public <#=c.ITypeReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt index 3b6520008..bf9fef940 100644 --- a/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt @@ -8,7 +8,6 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.core.IBaseClient; import <#=importNamespace#>.http.BaseRequestBuilder; -import java.util.Arrays; <# var mainNamespace = host.CurrentNamespace(); #> <#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), "BaseRequestBuilder", c.ITypeRequestBuilder())#> @@ -31,7 +30,7 @@ import java.util.Arrays; * @return the <#=c.ITypeRequest()#> instance */ public <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt index 4d11692d8..700565cf8 100644 --- a/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt @@ -8,7 +8,6 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.core.IBaseClient; import <#=importNamespace#>.http.BaseRequestBuilder; -import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeStreamRequestBuilder(), "BaseRequestBuilder", c.ITypeStreamRequestBuilder())#> @@ -30,7 +29,7 @@ import java.util.Arrays; * @return the <#=c.ITypeStreamRequest()#> instance */ public <#=c.ITypeStreamRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt index 239a5d904..f3e0f4f06 100644 --- a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt @@ -9,7 +9,6 @@ <# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #> import <#=importNamespace#>.http.BaseRequestBuilder; import <#=importNamespace#>.core.IBaseClient; -import java.util.Arrays; <#=TypeHelperJava.CreateClassDef(c.TypeWithReferencesRequestBuilder(), "BaseRequestBuilder", c.ITypeWithReferencesRequestBuilder())#> @@ -31,7 +30,7 @@ import java.util.Arrays; * @return the <#=c.ITypeWithReferencesRequest()#> instance */ public <#=c.ITypeWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt index 4622481c3..0d6f65fc0 100644 --- a/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt @@ -14,7 +14,6 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo import <#=importNamespace#>.options.FunctionOption; import <#=importNamespace#>.core.IBaseClient; import <#=importNamespace#>.core.<#=c.GetMethodRequestBuilderSuperClass() #>; -import java.util.Arrays; <# bool isAction = !c.AsOdcmMethod().IsFunction; #> <#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequestBuilder(), c.GetMethodRequestBuilderSuperClass(), c.ITypeCollectionRequestBuilder())#> @@ -50,7 +49,7 @@ import java.util.Arrays; * @return the IUserRequest instance */ public <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt index 08b6523d4..cbeeca068 100644 --- a/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt +++ b/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt @@ -10,7 +10,6 @@ import <#=importNamespace#>.core.BaseActionRequestBuilder; import <#=importNamespace#>.core.BaseFunctionRequestBuilder; import <#=importNamespace#>.core.IBaseClient; import com.google.gson.JsonElement; -import java.util.Arrays; <# bool isAction = !c.AsOdcmMethod().IsFunction; #> <#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), c.GetMethodRequestBuilderSuperClass(), c.ITypeRequestBuilder())#> @@ -42,7 +41,7 @@ import java.util.Arrays; * @return the <#=c.ITypeRequest()#> instance */ public <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** From 8b59be39bb22eaad856d0e0d609784d1abbffd69 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 16 Sep 2020 15:25:06 -0400 Subject: [PATCH 4/4] - updates test files --- .../requests/extensions/CallCollectionRequestBuilder.java | 3 +-- .../graph/requests/extensions/CallReferenceRequestBuilder.java | 3 +-- .../graph/requests/extensions/CallRequestBuilder.java | 3 +-- .../requests/extensions/CallWithReferenceRequestBuilder.java | 3 +-- .../requests/extensions/CloudCommunicationsRequestBuilder.java | 3 +-- .../graph/requests/extensions/EndpointRequestBuilder.java | 3 +-- .../graph/requests/extensions/EntityRequestBuilder.java | 3 +-- .../extensions/EntityType2CollectionRequestBuilder.java | 3 +-- .../extensions/EntityType2ReferenceRequestBuilder.java | 3 +-- .../graph/requests/extensions/EntityType2RequestBuilder.java | 3 +-- .../extensions/EntityType2WithReferenceRequestBuilder.java | 3 +-- .../EntityType3CollectionReferenceRequestBuilder.java | 3 +-- .../extensions/EntityType3CollectionRequestBuilder.java | 3 +-- .../EntityType3CollectionWithReferencesRequestBuilder.java | 3 +-- .../requests/extensions/EntityType3ForwardRequestBuilder.java | 3 +-- .../extensions/EntityType3ReferenceRequestBuilder.java | 3 +-- .../graph/requests/extensions/EntityType3RequestBuilder.java | 3 +-- .../extensions/EntityType3WithReferenceRequestBuilder.java | 3 +-- .../extensions/OnenotePageContentStreamRequestBuilder.java | 3 +-- .../requests/extensions/OnenotePageForwardRequestBuilder.java | 3 +-- .../graph/requests/extensions/OnenotePageRequestBuilder.java | 3 +-- .../graph/requests/extensions/PlannerGroupRequestBuilder.java | 3 +-- .../graph/requests/extensions/ScheduleRequestBuilder.java | 3 +-- .../requests/extensions/SingletonEntity1RequestBuilder.java | 3 +-- .../requests/extensions/SingletonEntity2RequestBuilder.java | 3 +-- .../graph/requests/extensions/TestEntityRequestBuilder.java | 3 +-- .../extensions/TestTypeQueryCollectionRequestBuilder.java | 3 +-- .../requests/extensions/TestTypeReferenceRequestBuilder.java | 3 +-- .../graph/requests/extensions/TestTypeRequestBuilder.java | 3 +-- .../extensions/TestTypeWithReferenceRequestBuilder.java | 3 +-- .../requests/extensions/TimeOffCollectionRequestBuilder.java | 3 +-- .../graph/requests/extensions/TimeOffRequestBuilder.java | 3 +-- .../extensions/TimeOffRequestCollectionRequestBuilder.java | 3 +-- .../requests/extensions/TimeOffRequestRequestBuilder.java | 3 +-- .../extensions/CallRecordCollectionRequestBuilder.java | 3 +-- .../requests/extensions/CallRecordItemRequestBuilder.java | 3 +-- .../requests/extensions/CallRecordRequestBuilder.java | 3 +-- .../callrecords/requests/extensions/OptionRequestBuilder.java | 3 +-- .../callrecords/requests/extensions/PhotoRequestBuilder.java | 3 +-- .../requests/extensions/PhotoStreamRequestBuilder.java | 3 +-- .../requests/extensions/SegmentCollectionRequestBuilder.java | 3 +-- .../requests/extensions/SegmentForwardRequestBuilder.java | 3 +-- .../callrecords/requests/extensions/SegmentRequestBuilder.java | 3 +-- .../extensions/SegmentTestActionCollectionRequestBuilder.java | 3 +-- .../requests/extensions/SessionCollectionRequestBuilder.java | 3 +-- .../requests/extensions/SessionReferenceRequestBuilder.java | 3 +-- .../callrecords/requests/extensions/SessionRequestBuilder.java | 3 +-- .../extensions/SessionWithReferenceRequestBuilder.java | 3 +-- .../requests/extensions/SingletonEntity1RequestBuilder.java | 3 +-- 49 files changed, 49 insertions(+), 98 deletions(-) diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java index 5abdfeaf8..628b0e8b5 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequestBuilder.java @@ -17,7 +17,6 @@ import com.microsoft.graph.requests.extensions.ICallCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -44,7 +43,7 @@ public CallCollectionRequestBuilder(final String requestUrl, final IBaseClient c * @return the IUserRequest instance */ public ICallCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java index 1edb7f1ad..3476e0dbf 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequestBuilder.java @@ -14,7 +14,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public CallReferenceRequestBuilder(final String requestUrl, final IBaseClient cl * @return The ICallReferenceRequest instance */ public ICallReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java index 639a2461e..ed7ed8047 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public CallRequestBuilder(final String requestUrl, final IBaseClient client, fin * @return the ICallRequest instance */ public ICallRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java index b7bbb82bf..0d6e4be35 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequestBuilder.java @@ -13,7 +13,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,7 +39,7 @@ public CallWithReferenceRequestBuilder(final String requestUrl, final IBaseClien * @return the ICallWithReferenceRequest instance */ public ICallWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java index b5e86c308..140fc7790 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequestBuilder.java @@ -20,7 +20,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -47,7 +46,7 @@ public CloudCommunicationsRequestBuilder(final String requestUrl, final IBaseCli * @return the ICloudCommunicationsRequest instance */ public ICloudCommunicationsRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java index 8adf4f31a..3b2f537a8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public EndpointRequestBuilder(final String requestUrl, final IBaseClient client, * @return the IEndpointRequest instance */ public IEndpointRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java index 8c67b480d..79dec8ad3 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public EntityRequestBuilder(final String requestUrl, final IBaseClient client, f * @return the IEntityRequest instance */ public IEntityRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java index 297c11c56..b15a9fef0 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequestBuilder.java @@ -17,7 +17,6 @@ import com.microsoft.graph.requests.extensions.IEntityType2CollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -44,7 +43,7 @@ public EntityType2CollectionRequestBuilder(final String requestUrl, final IBaseC * @return the IUserRequest instance */ public IEntityType2CollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java index 6cb1fcf07..af078ed22 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequestBuilder.java @@ -14,7 +14,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public EntityType2ReferenceRequestBuilder(final String requestUrl, final IBaseCl * @return The IEntityType2ReferenceRequest instance */ public IEntityType2ReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java index b7009f6af..9b77618cd 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2RequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public EntityType2RequestBuilder(final String requestUrl, final IBaseClient clie * @return the IEntityType2Request instance */ public IEntityType2Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java index 3a5dd917d..12646294f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequestBuilder.java @@ -13,7 +13,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,7 +39,7 @@ public EntityType2WithReferenceRequestBuilder(final String requestUrl, final IBa * @return the IEntityType2WithReferenceRequest instance */ public IEntityType2WithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java index da7ebe832..de62a0819 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequestBuilder.java @@ -16,7 +16,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,7 +42,7 @@ public EntityType3CollectionReferenceRequestBuilder(final String requestUrl, fin * @return the IUserRequest instance */ public IEntityType3CollectionReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java index 463137984..45879a217 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequestBuilder.java @@ -18,7 +18,6 @@ import com.microsoft.graph.requests.extensions.IEntityType3CollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -45,7 +44,7 @@ public EntityType3CollectionRequestBuilder(final String requestUrl, final IBaseC * @return the IUserRequest instance */ public IEntityType3CollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java index fc1b2cad5..80072b93c 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesRequestBuilder.java @@ -16,7 +16,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,7 +42,7 @@ public EntityType3CollectionWithReferencesRequestBuilder(final String requestUrl * @return the IUserRequest instance */ public IEntityType3CollectionWithReferencesRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java index 46546d898..5954ba2e8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ForwardRequestBuilder.java @@ -11,7 +11,6 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -48,7 +47,7 @@ public EntityType3ForwardRequestBuilder(final String requestUrl, final IBaseClie * @return the IEntityType3ForwardRequest instance */ public IEntityType3ForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java index 13c65e5e0..9b73fc558 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3ReferenceRequestBuilder.java @@ -16,7 +16,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,7 +42,7 @@ public EntityType3ReferenceRequestBuilder(final String requestUrl, final IBaseCl * @return The IEntityType3ReferenceRequest instance */ public IEntityType3ReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java index feb508705..cfa2c7ac9 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3RequestBuilder.java @@ -14,7 +14,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public EntityType3RequestBuilder(final String requestUrl, final IBaseClient clie * @return the IEntityType3Request instance */ public IEntityType3Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java index 087d8e97a..8bcf03c82 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3WithReferenceRequestBuilder.java @@ -15,7 +15,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -42,7 +41,7 @@ public EntityType3WithReferenceRequestBuilder(final String requestUrl, final IBa * @return the IEntityType3WithReferenceRequest instance */ public IEntityType3WithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java index a681fd557..75f3fa8ef 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageContentStreamRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public OnenotePageContentStreamRequestBuilder(final String requestUrl, final IBa * @return the IOnenotePageContentStreamRequest instance */ public IOnenotePageContentStreamRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java index 39c860943..de6c0f4ee 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageForwardRequestBuilder.java @@ -11,7 +11,6 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -58,7 +57,7 @@ public OnenotePageForwardRequestBuilder(final String requestUrl, final IBaseClie * @return the IOnenotePageForwardRequest instance */ public IOnenotePageForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java index 57e0255ba..e3f7d8c33 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/OnenotePageRequestBuilder.java @@ -13,7 +13,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -40,7 +39,7 @@ public OnenotePageRequestBuilder(final String requestUrl, final IBaseClient clie * @return the IOnenotePageRequest instance */ public IOnenotePageRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java index 7258f1bd8..5ffc7b0db 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/PlannerGroupRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public PlannerGroupRequestBuilder(final String requestUrl, final IBaseClient cli * @return the IPlannerGroupRequest instance */ public IPlannerGroupRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java index 6b23c5b8f..13a2b2446 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ScheduleRequestBuilder.java @@ -20,7 +20,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -47,7 +46,7 @@ public ScheduleRequestBuilder(final String requestUrl, final IBaseClient client, * @return the IScheduleRequest instance */ public IScheduleRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java index 28ee2489d..1e6e1681a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity1RequestBuilder.java @@ -14,7 +14,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public SingletonEntity1RequestBuilder(final String requestUrl, final IBaseClient * @return the ISingletonEntity1Request instance */ public ISingletonEntity1Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java index 35125d958..701499dff 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/SingletonEntity2RequestBuilder.java @@ -14,7 +14,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public SingletonEntity2RequestBuilder(final String requestUrl, final IBaseClient * @return the ISingletonEntity2Request instance */ public ISingletonEntity2Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java index 6d6b8e2c2..07146d8b7 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestEntityRequestBuilder.java @@ -18,7 +18,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -45,7 +44,7 @@ public TestEntityRequestBuilder(final String requestUrl, final IBaseClient clien * @return the ITestEntityRequest instance */ public ITestEntityRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java index 49d4cc241..cf2f671fa 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionRequestBuilder.java @@ -18,7 +18,6 @@ import com.microsoft.graph.options.FunctionOption; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.core.BaseActionRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -49,7 +48,7 @@ public TestTypeQueryCollectionRequestBuilder(final String requestUrl, final IBas * @return the IUserRequest instance */ public ITestTypeQueryCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java index 02f155a69..3edf7e3f4 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeReferenceRequestBuilder.java @@ -16,7 +16,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,7 +42,7 @@ public TestTypeReferenceRequestBuilder(final String requestUrl, final IBaseClien * @return The ITestTypeReferenceRequest instance */ public ITestTypeReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java index 2e13c5208..affbbb43a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeRequestBuilder.java @@ -14,7 +14,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public TestTypeRequestBuilder(final String requestUrl, final IBaseClient client, * @return the ITestTypeRequest instance */ public ITestTypeRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java index deb0dc7ae..464353cb2 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeWithReferenceRequestBuilder.java @@ -15,7 +15,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -42,7 +41,7 @@ public TestTypeWithReferenceRequestBuilder(final String requestUrl, final IBaseC * @return the ITestTypeWithReferenceRequest instance */ public ITestTypeWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java index 57128b658..96cf0ccef 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequestBuilder.java @@ -17,7 +17,6 @@ import com.microsoft.graph.requests.extensions.ITimeOffCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -44,7 +43,7 @@ public TimeOffCollectionRequestBuilder(final String requestUrl, final IBaseClien * @return the IUserRequest instance */ public ITimeOffCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java index 09ac4c0b3..c2f92a46b 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public TimeOffRequestBuilder(final String requestUrl, final IBaseClient client, * @return the ITimeOffRequest instance */ public ITimeOffRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java index 20f732fd2..82d7e634e 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequestBuilder.java @@ -18,7 +18,6 @@ import com.microsoft.graph.requests.extensions.ITimeOffRequestCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -45,7 +44,7 @@ public TimeOffRequestCollectionRequestBuilder(final String requestUrl, final IBa * @return the IUserRequest instance */ public ITimeOffRequestCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java index d993c385d..d40199f8a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public TimeOffRequestRequestBuilder(final String requestUrl, final IBaseClient c * @return the ITimeOffRequestRequest instance */ public ITimeOffRequestRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java index 2c5f4b588..4289a9220 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java @@ -18,7 +18,6 @@ import com.microsoft.graph2.callrecords.requests.extensions.ICallRecordItemRequestBuilder; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -45,7 +44,7 @@ public CallRecordCollectionRequestBuilder(final String requestUrl, final IBaseCl * @return the IUserRequest instance */ public ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java index 4da4d3bc2..397f8bb2f 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordItemRequestBuilder.java @@ -10,7 +10,6 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public CallRecordItemRequestBuilder(final String requestUrl, final IBaseClient c * @return the ICallRecordItemRequest instance */ public ICallRecordItemRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java index f99ad4f7a..5ab6f2a22 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordRequestBuilder.java @@ -20,7 +20,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -47,7 +46,7 @@ public CallRecordRequestBuilder(final String requestUrl, final IBaseClient clien * @return the ICallRecordRequest instance */ public ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java index 8a99b4f95..6cd6b2b27 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/OptionRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public OptionRequestBuilder(final String requestUrl, final IBaseClient client, f * @return the IOptionRequest instance */ public IOptionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java index c5bbad087..30dc04886 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public PhotoRequestBuilder(final String requestUrl, final IBaseClient client, fi * @return the IPhotoRequest instance */ public IPhotoRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java index e7d03c591..4456e51c7 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/PhotoStreamRequestBuilder.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -39,7 +38,7 @@ public PhotoStreamRequestBuilder(final String requestUrl, final IBaseClient clie * @return the IPhotoStreamRequest instance */ public IPhotoStreamRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java index f0124ddfc..03606a33e 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequestBuilder.java @@ -19,7 +19,6 @@ import com.microsoft.graph2.callrecords.requests.extensions.ISegmentCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -46,7 +45,7 @@ public SegmentCollectionRequestBuilder(final String requestUrl, final IBaseClien * @return the IUserRequest instance */ public ISegmentCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java index 7203ba4b0..77ddd27fc 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentForwardRequestBuilder.java @@ -11,7 +11,6 @@ import com.microsoft.graph.core.BaseFunctionRequestBuilder; import com.microsoft.graph.core.IBaseClient; import com.google.gson.JsonElement; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -48,7 +47,7 @@ public SegmentForwardRequestBuilder(final String requestUrl, final IBaseClient c * @return the ISegmentForwardRequest instance */ public ISegmentForwardRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java index 4c24e3be5..0476192d1 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentRequestBuilder.java @@ -25,7 +25,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -52,7 +51,7 @@ public SegmentRequestBuilder(final String requestUrl, final IBaseClient client, * @return the ISegmentRequest instance */ public ISegmentRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java index dacead801..e4f3223c1 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionRequestBuilder.java @@ -18,7 +18,6 @@ import com.microsoft.graph.options.FunctionOption; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.core.BaseActionRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -49,7 +48,7 @@ public SegmentTestActionCollectionRequestBuilder(final String requestUrl, final * @return the IUserRequest instance */ public ISegmentTestActionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java index 44b2d99d5..6eed2543a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequestBuilder.java @@ -17,7 +17,6 @@ import com.microsoft.graph2.callrecords.requests.extensions.ISessionCollectionRequest; import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -44,7 +43,7 @@ public SessionCollectionRequestBuilder(final String requestUrl, final IBaseClien * @return the IUserRequest instance */ public ISessionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java index e520fa4c6..2fc82f9e8 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionReferenceRequestBuilder.java @@ -18,7 +18,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -45,7 +44,7 @@ public SessionReferenceRequestBuilder(final String requestUrl, final IBaseClient * @return The ISessionReferenceRequest instance */ public ISessionReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java index c6d68fd47..2b15cbc36 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionRequestBuilder.java @@ -16,7 +16,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -43,7 +42,7 @@ public SessionRequestBuilder(final String requestUrl, final IBaseClient client, * @return the ISessionRequest instance */ public ISessionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java index 84168aea1..373da0bab 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionWithReferenceRequestBuilder.java @@ -17,7 +17,6 @@ import com.microsoft.graph.http.BaseRequestBuilder; import com.microsoft.graph.core.IBaseClient; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -44,7 +43,7 @@ public SessionWithReferenceRequestBuilder(final String requestUrl, final IBaseCl * @return the ISessionWithReferenceRequest instance */ public ISessionWithReferenceRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java index 5ca7ab4ba..1110b4183 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SingletonEntity1RequestBuilder.java @@ -14,7 +14,6 @@ import java.util.EnumSet; import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.http.BaseRequestBuilder; -import java.util.Arrays; // **NOTE** This file was generated by a tool and any changes will be overwritten. @@ -41,7 +40,7 @@ public SingletonEntity1RequestBuilder(final String requestUrl, final IBaseClient * @return the ISingletonEntity1Request instance */ public ISingletonEntity1Request buildRequest(final com.microsoft.graph.options.Option... requestOptions) { - return buildRequest(requestOptions != null && requestOptions.length > 0 ? Arrays.asList(requestOptions) : getOptions()); + return buildRequest(getOptions(requestOptions)); } /**