feature/java orderby

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) { #>
     /**

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java

@@ -95,6 +95,17 @@ public ICallCollectionRequest filter(final String value) {
         return (CallCollectionRequest)this;
     }
 
+    /**
+     * Sets the order by clause for the request
+     *
+     * @param value the order by clause
+     * @return the updated request
+     */
+    public ICallCollectionRequest orderBy(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
+        return (CallCollectionRequest)this;
+    }
+
     /**
      * Sets the select clause for the request
      *

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallReferenceRequest.java

@@ -63,16 +63,6 @@ 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
      *

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallRequest.java

@@ -154,16 +154,5 @@ 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;
-     }
-
 }
 

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallWithReferenceRequest.java

@@ -93,14 +93,4 @@ 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;
-    }
 }

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CloudCommunicationsRequest.java

@@ -162,16 +162,5 @@ 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;
-     }
-
 }
 

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EndpointRequest.java

@@ -154,16 +154,5 @@ 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;
-     }
-
 }
 

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityRequest.java

@@ -69,16 +69,5 @@ 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;
-     }
-
 }
 

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java

@@ -95,6 +95,17 @@ public IEntityType2CollectionRequest filter(final String value) {
         return (EntityType2CollectionRequest)this;
     }
 
+    /**
+     * Sets the order by clause for the request
+     *
+     * @param value the order by clause
+     * @return the updated request
+     */
+    public IEntityType2CollectionRequest orderBy(final String value) {
+        addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
+        return (EntityType2CollectionRequest)this;
+    }
+
     /**
      * Sets the select clause for the request
      *

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2ReferenceRequest.java

@@ -63,16 +63,6 @@ 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
      *

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2Request.java

@@ -154,16 +154,5 @@ 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;
-     }
-
 }
 

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2WithReferenceRequest.java

@@ -93,14 +93,4 @@ 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;
-    }
 }