- updates master with latest java changes

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt

@@ -67,6 +67,19 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
         return (<#=c.TypeCollectionReferenceRequest()#>)this;
     }
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeCollectionReferenceRequest()#> filter(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeCollectionReferenceRequest()#>)this;
+    }
+
 <# } #>
 <# if (c.GetFeatures().CanSelect) { #>
     /**

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt

@@ -23,10 +23,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(getOptions(requestOptions));
     }
 
+    /**
+     * 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);
     }

Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt

@@ -76,6 +76,19 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo
         return (<#=c.TypeCollectionRequest()#>)this;
     }
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeCollectionRequest()#> filter(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeCollectionRequest()#>)this;
+    }
+
 <# } #>
 <# if (c.GetFeatures().CanSelect) { #>
     /**

Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt

@@ -46,10 +46,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(getOptions(requestOptions));
     }
 
+    /**
+     * 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);
     }

Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt

@@ -50,6 +50,13 @@ import <#=importNamespace#>.concurrency.IExecutors;
         return (<#=c.TypeCollectionRequest()#>)this;
     }
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    public <#=c.ITypeCollectionRequest()#> filter(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeCollectionRequest()#>)this;
+    }
+
 <# } #>
 <# if (c.GetFeatures().CanSelect) { #>
     public <#=c.ITypeCollectionRequest()#> select(final String value) {

Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt

@@ -23,10 +23,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(getOptions(requestOptions));
     }
 
+    /**
+     * 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);
     }

Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt

@@ -58,6 +58,18 @@ import <#=importNamespace#>.core.IBaseClient;
         return (<#=c.TypeReferenceRequest()#>)this;
     }
 <# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeReferenceRequest()#> filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeReferenceRequest()#>)this;
+    }
+<# } #>
 <# if (c.GetFeatures().CanUpdate) { #>
     /**
      * Puts the <#=c.TypeName()#>

Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt

@@ -27,10 +27,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(getOptions(requestOptions));
     }
 
     /**

Templates/Java/requests_extensions/BaseEntityRequest.java.tt

@@ -98,6 +98,19 @@ import <#=importNamespace#>.http.HttpMethod;
          return (<#=c.TypeRequest()#>)this;
      }
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+     public <#=c.ITypeRequest()#> filter(final String value) {
+         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+         return (<#=c.TypeRequest()#>)this;
+     }
+
 <# } #>
 <# if (c.AsOdcmProperty() != null && c.AsOdcmProperty().IsCollection && c.GetFeatures().CanUseTop) { #>
 

Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt

@@ -26,10 +26,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(getOptions(requestOptions));
     }
 
     /**

Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt

@@ -25,10 +25,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(getOptions(requestOptions));
     }
 
     /**

Templates/Java/requests_extensions/BaseEntityWithReferenceRequest.java.tt

@@ -88,4 +88,16 @@ import <#=importNamespace#>.serializer.IJsonBackedObject;
         return (<#=c.TypeWithReferencesRequest()#>)this;
     }
 <# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeWithReferencesRequest()#> filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeWithReferencesRequest()#>)this;
+    }
+<# } #>
 }

Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt

@@ -26,10 +26,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(getOptions(requestOptions));
     }
 
     /**

Templates/Java/requests_extensions/BaseMethodBodyRequest.java.tt

@@ -105,5 +105,18 @@ import <#=importNamespace#>.http.HttpMethod;
         return (<#=typeRequest#>)this;
     }
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=iTypeRequest#> filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=typeRequest#>)this;
+    }
+
 <# } #>
 }

Templates/Java/requests_extensions/BaseMethodCollectionRequest.java.tt

@@ -143,5 +143,18 @@ import <#=importNamespace#>.concurrency.IExecutors;
         return (<#=c.ITypeCollectionRequest()#>)this;
     }
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeCollectionRequest()#> filter(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.ITypeCollectionRequest()#>)this;
+    }
+
 <# } #>
 }

Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt

@@ -41,11 +41,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(getOptions(requestOptions));
     }
 
+    /**
+     * 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(),

Templates/Java/requests_extensions/BaseMethodRequest.java.tt

@@ -79,6 +79,22 @@ if (c.AsOdcmMethod().IsAction()) {
         return (<#=c.TypeRequest()#>)this;
     }
 
+<#
+        }
+
+                if (c.GetFeatures().CanFilter) {
+#>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeRequest()#> filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeRequest()#>)this;
+    }
+
 <#
         }
 
@@ -227,7 +243,21 @@ if (c.AsOdcmMethod().IsAction()) {
 
 <#
         }
+        if (c.GetFeatures().CanFilter) {
+#>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public <#=c.ITypeRequest()#> filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (<#=c.TypeRequest()#>)this;
+    }
 
+<#
+        }
         if (c.AsOdcmProperty() != null && c.AsOdcmProperty().IsCollection && c.GetFeatures().CanUseTop) {
 #>