Skip to content

Commit 2547b08

Browse files
authored
Merge pull request #292 from microsoftgraph/feature/varargs-options-java
- adds a vararg support for build request in java templates
2 parents 579dcb3 + 8b59be3 commit 2547b08

File tree

116 files changed

+659
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+659
-191
lines changed

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@ import <#=importNamespace#>.core.IBaseClient;
2323
super(requestUrl, client, requestOptions);
2424
}
2525

26-
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() {
27-
return buildRequest(getOptions());
26+
/**
27+
* Creates the request
28+
*
29+
* @param requestOptions the options for this request
30+
* @return the IUserRequest instance
31+
*/
32+
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
33+
return buildRequest(getOptions(requestOptions));
2834
}
2935

36+
/**
37+
* Creates the request
38+
*
39+
* @param requestOptions the options for this request
40+
* @return the IUserRequest instance
41+
*/
3042
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
3143
return new <#=c.TypeCollectionReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
3244
}

Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,22 @@ import <#=importNamespace#>.core.IBaseClient;
4646
super(requestUrl, client, requestOptions);
4747
}
4848

49-
public <#=c.ITypeCollectionRequest()#> buildRequest() {
50-
return buildRequest(getOptions());
49+
/**
50+
* Creates the request
51+
*
52+
* @param requestOptions the options for this request
53+
* @return the IUserRequest instance
54+
*/
55+
public <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
56+
return buildRequest(getOptions(requestOptions));
5157
}
5258

59+
/**
60+
* Creates the request
61+
*
62+
* @param requestOptions the options for this request
63+
* @return the IUserRequest instance
64+
*/
5365
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
5466
return new <#=c.TypeCollectionRequest()#>(getRequestUrl(), getClient(), requestOptions);
5567
}

Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@ import <#=importNamespace#>.core.IBaseClient;
2323
super(requestUrl, client, requestOptions);
2424
}
2525

26-
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest() {
27-
return buildRequest(getOptions());
26+
/**
27+
* Creates the request
28+
*
29+
* @param requestOptions the options for this request
30+
* @return the IUserRequest instance
31+
*/
32+
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
33+
return buildRequest(getOptions(requestOptions));
2834
}
2935

36+
/**
37+
* Creates the request
38+
*
39+
* @param requestOptions the options for this request
40+
* @return the IUserRequest instance
41+
*/
3042
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
3143
return new <#=c.TypeCollectionWithReferencesRequest()#>(getRequestUrl(), getClient(), requestOptions);
3244
}

Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ import <#=importNamespace#>.core.IBaseClient;
2727
/**
2828
* Creates the request
2929
*
30+
* @param requestOptions the options for this request
3031
* @return The <#=c.ITypeReferenceRequest()#> instance
3132
*/
32-
public <#=c.ITypeReferenceRequest()#> buildRequest() {
33-
return buildRequest(getOptions());
33+
public <#=c.ITypeReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
34+
return buildRequest(getOptions(requestOptions));
3435
}
3536

3637
/**

Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ import <#=importNamespace#>.http.BaseRequestBuilder;
2626
/**
2727
* Creates the request
2828
*
29+
* @param requestOptions the options for this request
2930
* @return the <#=c.ITypeRequest()#> instance
3031
*/
31-
public <#=c.ITypeRequest()#> buildRequest() {
32-
return buildRequest(getOptions());
32+
public <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
33+
return buildRequest(getOptions(requestOptions));
3334
}
3435

3536
/**

Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ import <#=importNamespace#>.http.BaseRequestBuilder;
2525
/**
2626
* Creates the request
2727
*
28+
* @param requestOptions the options for this request
2829
* @return the <#=c.ITypeStreamRequest()#> instance
2930
*/
30-
public <#=c.ITypeStreamRequest()#> buildRequest() {
31-
return buildRequest(getOptions());
31+
public <#=c.ITypeStreamRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
32+
return buildRequest(getOptions(requestOptions));
3233
}
3334

3435
/**

Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ import <#=importNamespace#>.core.IBaseClient;
2626
/**
2727
* Creates the request
2828
*
29+
* @param requestOptions the options for this request
2930
* @return the <#=c.ITypeWithReferencesRequest()#> instance
3031
*/
31-
public <#=c.ITypeWithReferencesRequest()#> buildRequest() {
32-
return buildRequest(getOptions());
32+
public <#=c.ITypeWithReferencesRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
33+
return buildRequest(getOptions(requestOptions));
3334
}
3435

3536
/**

Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,23 @@ import <#=importNamespace#>.core.<#=c.GetMethodRequestBuilderSuperClass() #>;
4141
<# } #>
4242
}
4343
<# } #>
44-
45-
public <#=c.ITypeCollectionRequest()#> buildRequest() {
46-
return buildRequest(getOptions());
44+
45+
/**
46+
* Creates the request
47+
*
48+
* @param requestOptions the options for this request
49+
* @return the IUserRequest instance
50+
*/
51+
public <#=c.ITypeCollectionRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
52+
return buildRequest(getOptions(requestOptions));
4753
}
4854

55+
/**
56+
* Creates the request
57+
*
58+
* @param requestOptions the options for this request
59+
* @return the IUserRequest instance
60+
*/
4961
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
5062
<#= c.TypeCollectionRequest()#> request = new <#=c.TypeCollectionRequest()#>(
5163
getRequestUrl(),

Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ import com.google.gson.JsonElement;
3737
/**
3838
* Creates the <#=c.ITypeRequest()#>
3939
*
40+
* @param requestOptions the options for the request
4041
* @return the <#=c.ITypeRequest()#> instance
4142
*/
42-
public <#=c.ITypeRequest()#> buildRequest() {
43-
return buildRequest(getOptions());
43+
public <#=c.ITypeRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
44+
return buildRequest(getOptions(requestOptions));
4445
}
4546

4647
/**

Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,19 @@
1212

1313
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionReferenceRequestBuilder(), "IRequestBuilder")#>
1414

15-
<#=c.ITypeCollectionReferenceRequest()#> buildRequest();
16-
15+
/**
16+
* Creates the request
17+
*
18+
* @param requestOptions the options for this request
19+
* @return the IUserRequest instance
20+
*/
21+
<#=c.ITypeCollectionReferenceRequest()#> buildRequest(final com.microsoft.graph.options.Option... requestOptions);
22+
23+
/**
24+
* Creates the request
25+
*
26+
* @param requestOptions the options for this request
27+
* @return the IUserRequest instance
28+
*/
1729
<#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions);
1830
}

0 commit comments

Comments
 (0)