Merge pull request #116 from microsoftgraph/raw-type-cleanup

Update generated Java files to include generic types

Author: Caitlin Bales (MSFT)

Templates/Java/requests_extensions/EntityRequest.java.tt

@@ -12,23 +12,23 @@
     /**
      * The request for the <#=TypeName(c)#>
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
-     * @param responseClass The class of the reponse
+     * @param responseClass The class of the response
      */
     public <#=TypeRequest(c)#>(final String requestUrl,
             final <#=IBaseClientType()#> client,
             final java.util.List<? extends Option> requestOptions,
-            final Class responseClass) {
+            final Class<? extends <#=ClassTypeName(c)#>> responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
 <# } #>
 
     /**
      * The request for the <#=TypeName(c)#>
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
      */

Templates/Java/requests_extensions/IEntityRequestBuilder.java.tt

@@ -7,4 +7,5 @@
 <#=CreatePackageDef(host)#>
 
 <#=CreateInterfaceDef(ITypeRequestBuilder(c), IBaseTypeRequestBuilder(c))#>
+
 }

Templates/Java/requests_generated/BaseEntityRequest.java.tt

@@ -5,21 +5,29 @@
 <#host.TemplateName = BaseTypeRequest(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
+<#
+String classDeclaration = "";
+if (c.AsOdcmClass().Derived.Any() && c.AsOdcmClass().Base != null)
+{
+	classDeclaration += "? extends ";
+}
+classDeclaration += TypeName(c);
+#>
 
 <#=CreateClassDef(BaseTypeRequest(c), "BaseRequest", IBaseTypeRequest(c))#>
 
     /**
      * The request for the <#=TypeName(c)#>
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
-     * @param responseClass The class of the reponse
+     * @param responseClass The class of the response
      */
     public <#=BaseTypeRequest(c)#>(final String requestUrl,
             final <#=IBaseClientType()#> client,
             final java.util.List<? extends Option> requestOptions,
-            final Class responseClass) {
+            final Class<<#=classDeclaration#>> responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
 

Templates/Java/requests_generated/BaseStreamRequest.java.tt

@@ -13,16 +13,16 @@ import java.io.*;
     /**
      * The request for this <#=TypeName(c)#>
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
-     * @param responseClass The class of the reponse
+     * @param responseClass The class of the response
      */
     public <#=BaseTypeStreamRequest(c)#>(
                          final String requestUrl,
                          final <#=IBaseClientType()#> client,
                          final java.util.List<? extends Option> requestOptions,
-                         final Class responseClass) {
+                         final Class<<#=ClassTypeName(c)#>> responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }