Merge pull request #301 from microsoftgraph/feature/java-orderby

feature/java orderby

Author: baywet

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt

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

Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt

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

Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt

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

Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt

@@ -58,18 +58,6 @@ 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/BaseEntityRequest.java.tt

@@ -98,19 +98,6 @@ 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/BaseEntityWithReferenceRequest.java.tt

@@ -88,16 +88,4 @@ 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/BaseMethodBodyRequest.java.tt

@@ -105,18 +105,5 @@ 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

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

Templates/Java/requests_extensions/BaseMethodRequest.java.tt

@@ -79,22 +79,6 @@ 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;
-    }
-
 <#
         }
 
@@ -256,6 +240,21 @@ if (c.AsOdcmMethod().IsAction()) {
         return (<#=c.TypeRequest()#>)this;
     }
 
+<#
+        }
+        if (c.GetFeatures().CanSort) {
+#>
+    /**
+     * Sets the order by clause for the request
+     *
+     * @param value the order by clause
+     * @return the updated request
+     */
+    public <#=c.ITypeRequest()#> orderBy(final String value) {
+        getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$orderby", value));
+        return (<#=c.TypeRequest()#>)this;
+    }
+
 <#
         }
         if (c.AsOdcmProperty() != null && c.AsOdcmProperty().IsCollection && c.GetFeatures().CanUseTop) {

Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt

@@ -39,6 +39,16 @@ import <#=importNamespace#>.http.IHttpRequest;
      */
     <#=c.ITypeCollectionRequest()#> filter(final String value);
 
+<# } #>
+<# if (c.GetFeatures().CanSort) { #>
+    /**
+     * Sets the order by clause for the request
+     *
+     * @param value the order by clause
+     * @return the updated request
+     */
+    <#=c.ITypeCollectionRequest()#> orderBy(final String value);
+
 <# } #>
 <# if (c.GetFeatures().CanSelect) { #>
     /**