- adds a vararg support for build request in java templates

baywet · baywet · commit ba083832d25f · 2020-09-16T10:41:07.000-04:00
diff --git 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<? extends <#=importNamespace#>.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
@@ -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<? extends <#=importNamespace#>.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
@@ -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<? extends <#=importNamespace#>.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<? extends <#=importNamespace#>.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
@@ -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
@@ -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<? extends <#=importNamespace#>.options.Option> requestOptions);
 }
diff --git 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<? extends <#=importNamespace#>.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
@@ -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<? extends <#=importNamespace#>.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<? extends <#=importNamespace#>.options.Option> requestOptions);
 
 }
diff --git 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
