- fixes an issue where request and builders would generate duplicate methods

Author: baywet

Templates/Java/requests_extensions/BaseMethodCollectionRequest.java.tt

@@ -6,9 +6,35 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionPage(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
+<# if (c.AsOdcmMethod().IsAction() && c.AsOdcmMethod().Parameters.Any()) { #>
+import com.microsoft.graph.models.extensions.<#=TypeBody(c)#>;
+<# } #>
+<# if (ShouldIncludeCollectionTypeReference(c)) { #>
+import com.microsoft.graph.models.<#=OdcmMethodReturnNamespaceSection(c as OdcmMethod)#>.<#=OdcmMethodReturnType(c as OdcmMethod)#>;
+<# } #>
+<# foreach (var method in c.AsOdcmMethod().WithOverloads()) {
+    var parameterList = MethodParametersImports(method);
+    if (parameterList != "") {
+#>
+<#=parameterList#>
+<#
+    }
+} 
+#>
+import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseCollectionRequest;
+import com.microsoft.graph.concurrency.IExecutors;
+
 <#=CreateClassDef(TypeCollectionRequest(c),"BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionRequest(c))#>
 
-<# if (c.AsOdcmMethod().IsAction()) { #>
+<# if (c.AsOdcmMethod().IsAction() && c.AsOdcmMethod().Parameters.Any()) { #>
 
     protected final <#=TypeBody(c)#> body;
 
@@ -27,7 +53,7 @@
 <# } else { #>
         super(requestUrl, client, requestOptions, null);
 <# } #>
-<# if (c.AsOdcmMethod().IsAction()) { #>
+<# if (c.AsOdcmMethod().IsAction() && c.AsOdcmMethod().Parameters.Any()) { #>
         body = new <#=TypeBody(c)#>();
 <# } #>
     }
@@ -49,10 +75,10 @@
     }
 
     public <#=ITypeCollectionPage(c)#> post() throws ClientException {
-<# if (c.AsOdcmMethod().IsAction()) { #>
+<# if (c.AsOdcmMethod().IsAction() && c.AsOdcmMethod().Parameters.Any()) { #>
         final <#=TypeCollectionResponse(c)#> response = post(body);
 <# } else { #>
-        final <#=TypeCollectionResponse(c)#> response = post();
+        final <#=TypeCollectionResponse(c)#> response = super.post(null);
 <# } #>
         return buildFromResponse(response);
     }

Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt

@@ -11,11 +11,12 @@ import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.FunctionOption;
 import com.google.gson.JsonElement;
+import com.microsoft.graph.core.<#=RequestBuilderSuperClass(c) #>;
 
 <# bool isAction = !c.AsOdcmMethod().IsFunction; #>
 <#=CreateClassDef(TypeRequestBuilder(c), RequestBuilderSuperClass(c), ITypeRequestBuilder(c))#>
 
-<# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
+<# foreach (var method in c.AsOdcmMethod().WithDistinctOverloads()) { #>
     /**
      * The request builder for this <#=TypeName(c)#>
      *