Convert Options list to wildcard

Caitlin Bales (MSFT) · Caitlin Bales (MSFT) · commit da8ef07a8dac · 2018-01-17T17:36:07.000-08:00
As per microsoftgraph/msgraph-sdk-java#27
diff --git a/Templates/Java/requests_extensions/EntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_extensions/EntityCollectionReferenceRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param options The options for this request
      */
-    public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> options) {
+    public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> options) {
         super(requestUrl, client, options);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityCollectionReferenceRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/EntityCollectionRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeCollectionRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityCollectionRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityCollectionWithReferencesRequest.java.tt b/Templates/Java/requests_extensions/EntityCollectionWithReferencesRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionWithReferencesRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeCollectionWithReferencesRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityCollectionWithReferencesRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeCollectionWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityReferenceRequest.java.tt b/Templates/Java/requests_extensions/EntityReferenceRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityReferenceRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityRequest.java.tt b/Templates/Java/requests_extensions/EntityRequest.java.tt
@@ -19,7 +19,7 @@
      */
     public <#=TypeRequest(c)#>(final String requestUrl,
             final <#=IBaseClientType()#> client,
-            final java.util.List<Option> requestOptions,
+            final java.util.List<? extends Option> requestOptions,
             final Class responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
@@ -32,7 +32,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=ClassTypeName(c)#>.class);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityStreamRequest.java.tt b/Templates/Java/requests_extensions/EntityStreamRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeStreamRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeStreamRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=ClassTypeName(c)#>.class);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityStreamRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityStreamRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeStreamRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeStreamRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityWithReferenceRequest.java.tt b/Templates/Java/requests_extensions/EntityWithReferenceRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeWithReferencesRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeWithReferencesRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/EntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/EntityWithReferenceRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/MethodCollectionRequest.java.tt b/Templates/Java/requests_extensions/MethodCollectionRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeCollectionRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/MethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/MethodCollectionRequestBuilder.java.tt
@@ -16,7 +16,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions<#=MethodParametersSignature(method)#>) {
+    public <#=TypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions<#=MethodParametersSignature(method)#>) {
         super(requestUrl, client, requestOptions<#=MethodParametersValues(method)#>);
     }
 <# } #>
diff --git a/Templates/Java/requests_extensions/MethodRequest.java.tt b/Templates/Java/requests_extensions/MethodRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }
diff --git a/Templates/Java/requests_extensions/MethodRequestBuilder.java.tt b/Templates/Java/requests_extensions/MethodRequestBuilder.java.tt
@@ -16,7 +16,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions<#=MethodParametersSignature(method)#>) {
+    public <#=TypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions<#=MethodParametersSignature(method)#>) {
         super(requestUrl, client, requestOptions<#=MethodParametersValues(method)#>);
     }
 <# } #>
diff --git a/Templates/Java/requests_generated/BaseEntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_generated/BaseEntityCollectionReferenceRequest.java.tt
@@ -16,7 +16,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeCollectionReferenceRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeCollectionReferenceRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityCollectionReferenceRequestBuilder.java.tt
@@ -15,15 +15,15 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
     public <#=ITypeCollectionReferenceRequest(c)#> buildRequest() {
         return buildRequest(getOptions());
     }
 
-    public <#=ITypeCollectionReferenceRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeCollectionReferenceRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeCollectionReferenceRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 }
diff --git a/Templates/Java/requests_generated/BaseEntityCollectionRequest.java.tt b/Templates/Java/requests_generated/BaseEntityCollectionRequest.java.tt
@@ -16,7 +16,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeCollectionRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeCollectionRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityCollectionRequestBuilder.java.tt
@@ -15,15 +15,15 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
     public <#=ITypeCollectionRequest(c)#> buildRequest() {
         return buildRequest(getOptions());
     }
 
-    public <#=ITypeCollectionRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeCollectionRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeCollectionRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityCollectionWithReferencesRequest.java.tt b/Templates/Java/requests_generated/BaseEntityCollectionWithReferencesRequest.java.tt
@@ -16,7 +16,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeCollectionWithReferencesRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeCollectionWithReferencesRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityCollectionWithReferencesRequestBuilder.java.tt
@@ -15,15 +15,15 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeCollectionWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeCollectionWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
     public <#=ITypeCollectionWithReferencesRequest(c)#> buildRequest() {
         return buildRequest(getOptions());
     }
 
-    public <#=ITypeCollectionWithReferencesRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeCollectionWithReferencesRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeCollectionWithReferencesRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityReferenceRequest.java.tt b/Templates/Java/requests_generated/BaseEntityReferenceRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeReferenceRequest(c)#>(String requestUrl, <#=IBaseClientType()#> client, java.util.List<Option> requestOptions) {
+    public <#=BaseTypeReferenceRequest(c)#>(String requestUrl, <#=IBaseClientType()#> client, java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=ClassTypeName(c)#>.class);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityReferenceRequestBuilder.java.tt
@@ -16,7 +16,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
@@ -30,7 +30,7 @@
     /**
      * Creates the request with specific requestOptions instead of the existing requestOptions
      */
-    public <#=ITypeReferenceRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeReferenceRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeReferenceRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 }
diff --git a/Templates/Java/requests_generated/BaseEntityRequest.java.tt b/Templates/Java/requests_generated/BaseEntityRequest.java.tt
@@ -18,7 +18,7 @@
      */
     public <#=BaseTypeRequest(c)#>(final String requestUrl,
             final <#=IBaseClientType()#> client,
-            final java.util.List<Option> requestOptions,
+            final java.util.List<? extends Option> requestOptions,
             final Class responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
diff --git a/Templates/Java/requests_generated/BaseEntityRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
@@ -29,7 +29,7 @@
     /**
      * Creates the request with specific requestOptions instead of the existing requestOptions
      */
-    public <#=ITypeRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityStreamRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityStreamRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeStreamRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeStreamRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
@@ -29,7 +29,7 @@
     /**
      * Creates the request with specific options instead of the existing options
      */
-    public <#=ITypeStreamRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeStreamRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeStreamRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 <#
diff --git a/Templates/Java/requests_generated/BaseEntityWithReferenceRequest.java.tt b/Templates/Java/requests_generated/BaseEntityWithReferenceRequest.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeWithReferencesRequest(c)#>(String requestUrl, <#=IBaseClientType()#> client, java.util.List<Option> requestOptions) {
+    public <#=BaseTypeWithReferencesRequest(c)#>(String requestUrl, <#=IBaseClientType()#> client, java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=ClassTypeName(c)#>.class);
     }
 
diff --git a/Templates/Java/requests_generated/BaseEntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseEntityWithReferenceRequestBuilder.java.tt
@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=BaseTypeWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=BaseTypeWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
@@ -29,7 +29,7 @@
     /**
      * Creates the request with specific options instead of the existing options
      */
-    public <#=ITypeWithReferencesRequest(c)#> buildRequest(final java.util.List<Option> requestOptions) {
+    public <#=ITypeWithReferencesRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
         return new <#=TypeWithReferencesRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 
diff --git a/Templates/Java/requests_generated/BaseMethodBodyRequest.java.tt b/Templates/Java/requests_generated/BaseMethodBodyRequest.java.tt
@@ -33,7 +33,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=baseTypeRequest#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
+    public <#=baseTypeRequest#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=returnType#>.class);
         body = new <#=TypeBody(c)#>();
     }
diff --git a/Templates/Java/requests_generated/BaseMethodCollectionRequest.java.tt b/Templates/Java/requests_generated/BaseMethodCollectionRequest.java.tt
diff --git a/Templates/Java/requests_generated/BaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseMethodCollectionRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/BaseMethodRequest.java.tt b/Templates/Java/requests_generated/BaseMethodRequest.java.tt
diff --git a/Templates/Java/requests_generated/BaseMethodRequestBuilder.java.tt b/Templates/Java/requests_generated/BaseMethodRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/BaseStreamRequest.java.tt b/Templates/Java/requests_generated/BaseStreamRequest.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityCollectionReferenceRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityCollectionRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityCollectionWithReferencesRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityReferenceRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityStreamRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityStreamRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseEntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseEntityWithReferenceRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseMethodCollectionRequestBuilder.java.tt
diff --git a/Templates/Java/requests_generated/IBaseMethodRequestBuilder.java.tt b/Templates/Java/requests_generated/IBaseMethodRequestBuilder.java.tt

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* @param client The service client`
`16`	`16`	`* @param options The options for this request`
`17`	`17`	`*/`
`18`		`- public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> options) {`
	`18`	`+ public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> options) {`
`19`	`19`	`super(requestUrl, client, options);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`public <#=TypeRequest(c)#>(final String requestUrl,`
`21`	`21`	`final <#=IBaseClientType()#> client,`
`22`		`- final java.util.List<Option> requestOptions,`
	`22`	`+ final java.util.List<? extends Option> requestOptions,`
`23`	`23`	`final Class responseClass) {`
`24`	`24`	`super(requestUrl, client, requestOptions, responseClass);`
`25`	`25`	`}`
`@@ -32,7 +32,7 @@`
`32`	`32`	`* @param client The service client`
`33`	`33`	`* @param requestOptions The options for this request`
`34`	`34`	`*/`
`35`		`- public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {`
	`35`	`+ public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {`
`36`	`36`	`super(requestUrl, client, requestOptions, <#=ClassTypeName(c)#>.class);`
`37`	`37`	`}`
`38`	`38`	`}`