- refactors vararg implementation to reduce the amount of generated code

Author: baywet

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**

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));
     }
 
     /**