- adds missing fluent method for odata filter

microsoftgraph · Sep 10, 2020 · f320610 · f320610
1 parent 70d6cbf
commit f320610
Show file tree

Hide file tree

Showing 64 changed files with 690 additions and 0 deletions.
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt b/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) { #>
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt b/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) { #>
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt b/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) {

diff --git a/Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt b/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()#>

diff --git a/Templates/Java/requests_extensions/BaseEntityRequest.java.tt b/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) { #>
 

diff --git a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequest.java.tt b/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;
+    }
+<# } #>
 }
diff --git a/Templates/Java/requests_extensions/BaseMethodBodyRequest.java.tt b/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;
+    }
+
 <# } #>
 }
diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionRequest.java.tt b/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;
+    }
+
 <# } #>
 }
diff --git a/Templates/Java/requests_extensions/BaseMethodRequest.java.tt b/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) {
 #>
 

diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt
@@ -28,6 +28,16 @@ import <#=importNamespace#>.http.IBaseCollectionPage;
      */
     <#=c.ITypeCollectionRequest()#> expand(final String value);
 
+<# } #>
+<# if (c.GetFeatures().CanFilter) { #>
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    <#=c.ITypeCollectionRequest()#> filter(final String value);
+
 <# } #>
 <# if (c.GetFeatures().CanSelect) { #>
     /**

diff --git a/...iter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java b/...iter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java
@@ -84,6 +84,17 @@ public ICallCollectionRequest expand(final String value) {
         return (CallCollectionRequest)this;
     }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public ICallCollectionRequest filter(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (CallCollectionRequest)this;
+    }
+
     /**
      * Sets the select clause for the request
      *

diff --git a/...riter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequest.java b/...riter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequest.java
@@ -63,6 +63,16 @@ public ICallReferenceRequest expand(final String value) {
         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
         return (CallReferenceRequest)this;
     }
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public ICallReferenceRequest filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (CallReferenceRequest)this;
+    }
     /**
      * Puts the Call
      *

diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequest.java
@@ -154,5 +154,16 @@ public ICallRequest expand(final String value) {
          return (CallRequest)this;
      }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+     public ICallRequest filter(final String value) {
+         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+         return (CallRequest)this;
+     }
+
 }
 
diff --git a/...r.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequest.java b/...r.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequest.java
@@ -93,4 +93,14 @@ public ICallWithReferenceRequest expand(final String value) {
         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
         return (CallWithReferenceRequest)this;
     }
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public ICallWithReferenceRequest filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (CallWithReferenceRequest)this;
+    }
 }
diff --git a/...Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequest.java b/...Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequest.java
@@ -162,5 +162,16 @@ public ICloudCommunicationsRequest expand(final String value) {
          return (CloudCommunicationsRequest)this;
      }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+     public ICloudCommunicationsRequest filter(final String value) {
+         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+         return (CloudCommunicationsRequest)this;
+     }
+
 }
 
diff --git a/...Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequest.java b/...Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequest.java
@@ -154,5 +154,16 @@ public IEndpointRequest expand(final String value) {
          return (EndpointRequest)this;
      }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+     public IEndpointRequest filter(final String value) {
+         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+         return (EndpointRequest)this;
+     }
+
 }
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequest.java
@@ -69,5 +69,16 @@ public IEntityRequest expand(final String value) {
          return (EntityRequest)this;
      }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+     public IEntityRequest filter(final String value) {
+         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+         return (EntityRequest)this;
+     }
+
 }
 
diff --git a/...st/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java b/...st/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java
@@ -84,6 +84,17 @@ public IEntityType2CollectionRequest expand(final String value) {
         return (EntityType2CollectionRequest)this;
     }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public IEntityType2CollectionRequest filter(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (EntityType2CollectionRequest)this;
+    }
+
     /**
      * Sets the select clause for the request
      *

diff --git a/...est/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequest.java b/...est/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequest.java
@@ -63,6 +63,16 @@ public IEntityType2ReferenceRequest expand(final String value) {
         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
         return (EntityType2ReferenceRequest)this;
     }
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public IEntityType2ReferenceRequest filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (EntityType2ReferenceRequest)this;
+    }
     /**
      * Puts the EntityType2
      *

diff --git a/...ewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2Request.java b/...ewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2Request.java
@@ -154,5 +154,16 @@ public IEntityType2Request expand(final String value) {
          return (EntityType2Request)this;
      }
 
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+     public IEntityType2Request filter(final String value) {
+         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+         return (EntityType2Request)this;
+     }
+
 }
 
diff --git a/...TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequest.java b/...TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequest.java
@@ -93,4 +93,14 @@ public IEntityType2WithReferenceRequest expand(final String value) {
         getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
         return (EntityType2WithReferenceRequest)this;
     }
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     * @return the updated request
+     */
+    public IEntityType2WithReferenceRequest filter(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
+        return (EntityType2WithReferenceRequest)this;
+    }
 }