Skip to content

Commit fa265f9

Browse files
baywetbaywet
committed
- switches to fully qualified references for options and no references
1 parent dd44933 commit fa265f9

29 files changed

+38
-61
lines changed

‎Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<#=host.CreatePackageDef()#>
88

99
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1211
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
1312
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.ReferenceRequestBody;
@@ -22,7 +21,7 @@ import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
2221
* @param client the service client
2322
* @param requestOptions the options for this request
2423
*/
25-
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
24+
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2625
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2726
}
2827

‎Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
109
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1211

@@ -19,15 +18,15 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1918
* @param client the service client
2019
* @param requestOptions the options for this request
2120
*/
22-
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
21+
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2322
super(requestUrl, client, requestOptions);
2423
}
2524

2625
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() {
2726
return buildRequest(getOptions());
2827
}
2928

30-
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
29+
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
3130
return new <#=c.TypeCollectionReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
3231
}
3332
}

‎Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
109
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1211
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
@@ -26,7 +25,7 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<
2625
* @param client the service client
2726
* @param requestOptions the options for this request
2827
*/
29-
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
28+
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
3029
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
3130
}
3231

‎Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<
2828
}
2929
}
3030
#>
31-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
3231
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
3332
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
3433

@@ -41,15 +40,15 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
4140
* @param client the service client
4241
* @param requestOptions the options for this request
4342
*/
44-
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
43+
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
4544
super(requestUrl, client, requestOptions);
4645
}
4746

4847
public <#=c.ITypeCollectionRequest()#> buildRequest() {
4948
return buildRequest(getOptions());
5049
}
5150

52-
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
51+
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
5352
return new <#=c.TypeCollectionRequest()#>(getRequestUrl(), getClient(), requestOptions);
5453
}
5554

‎Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<#=host.CreatePackageDef()#>
88

99
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1211
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
1312
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.IExecutors;
@@ -21,7 +20,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.IExecutors;
2120
* @param client the service client
2221
* @param requestOptions the options for this request
2322
*/
24-
public <#=c.TypeCollectionWithReferencesRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
23+
public <#=c.TypeCollectionWithReferencesRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2524
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2625
}
2726

‎Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
109
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1211

@@ -19,15 +18,15 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1918
* @param client the service client
2019
* @param requestOptions the options for this request
2120
*/
22-
public <#=c.TypeCollectionWithReferencesRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
21+
public <#=c.TypeCollectionWithReferencesRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2322
super(requestUrl, client, requestOptions);
2423
}
2524

2625
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest() {
2726
return buildRequest(getOptions());
2827
}
2928

30-
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
29+
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
3130
return new <#=c.TypeCollectionWithReferencesRequest()#>(getRequestUrl(), getClient(), requestOptions);
3231
}
3332

‎Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<#=host.CreatePackageDef()#>
88

99
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequest;
1211
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.HttpMethod;
1312
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
@@ -21,7 +20,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
2120
* @param client the service client
2221
* @param requestOptions the options for this request
2322
*/
24-
public <#=c.TypeReferenceRequest()#>(String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
23+
public <#=c.TypeReferenceRequest()#>(String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2524
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
2625
}
2726

‎Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<#=writer.WriteHeader()#>
88
<#=host.CreatePackageDef()#>
99

10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
1110
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
1211
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1312

@@ -20,7 +19,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
2019
* @param client the service client
2120
* @param requestOptions the options for this request
2221
*/
23-
public <#=c.TypeReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
22+
public <#=c.TypeReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2423
super(requestUrl, client, requestOptions);
2524
}
2625

@@ -39,7 +38,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
3938
* @param requestOptions the options for this request
4039
* @return the <#=c.ITypeReferenceRequest()#> instance
4140
*/
42-
public <#=c.ITypeReferenceRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
41+
public <#=c.ITypeReferenceRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
4342
return new <#=c.TypeReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
4443
}
4544
}

‎Templates/Java/requests_extensions/BaseEntityRequest.java.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.HttpMethod;
2222
*/
2323
public <#=c.TypeRequest()#>(final String requestUrl,
2424
final <#=TypeHelperJava.IBaseClientType()#> client,
25-
final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
25+
final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions,
2626
final Class<<# if(!host.TemplateName.Equals("EntityRequest")){ #>? extends <#}#><#=c.ClassTypeName()#>> responseClass) {
2727
super(requestUrl, client, requestOptions, responseClass);
2828
}
@@ -35,7 +35,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.HttpMethod;
3535
* @param client the service client
3636
* @param requestOptions the options for this request
3737
*/
38-
public <#=c.TypeRequest()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
38+
public <#=c.TypeRequest()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
3939
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
4040
}
4141

‎Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<#=host.CreatePackageDef()#>
88
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
99
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
1110

1211
<#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), "BaseRequestBuilder", c.ITypeRequestBuilder())#>
1312

@@ -18,7 +17,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
1817
* @param client the service client
1918
* @param requestOptions the options for this request
2019
*/
21-
public <#=c.TypeRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
20+
public <#=c.TypeRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
2221
super(requestUrl, client, requestOptions);
2322
}
2423

@@ -37,7 +36,7 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
3736
* @param requestOptions the options for this request
3837
* @return the <#=c.ITypeRequest()#> instance
3938
*/
40-
public <#=c.ITypeRequest()#> buildRequest(final java.util.List<? extends Option> requestOptions) {
39+
public <#=c.ITypeRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
4140
return new <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeRequest()#>(getRequestUrl(), getClient(), requestOptions);
4241
}
4342

0 commit comments

Comments
 (0)