Skip to content

Commit 3379cb6

Browse files
baywetbaywet
authored
Merge pull request #305 from microsoftgraph/dev
release of lastest java changes
2 parents 412abea + 31fe6ac commit 3379cb6

255 files changed

Lines changed: 5113 additions & 1045 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ String s = c.TypeName();
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public <#=c.TypeCollectionPage()#>(final <#=c.TypeCollectionResponse()#> response, final <#=c.ITypeCollectionRequestBuilder()#> builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
2727
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2828
}
2929

30-
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) {
3130
<#
3231
var navigationProperty = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType(((CustomT4Host)Host).CurrentModel);
3332
if (navigationProperty != null) {
@@ -39,6 +38,7 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
3938

4039
String prop = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType(((CustomT4Host)Host).CurrentModel).Name;
4140
#>
41+
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<? super <#=c.TypeName()#>> callback) {
4242
final String requestUrl = getBaseRequest().getRequestUrl().toString();
4343
final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=c.TypeName()#>.id);
4444
new <#=c.TypeWithReferencesRequestBuilder()#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
@@ -80,6 +80,19 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
8080
return (<#=c.TypeCollectionReferenceRequest()#>)this;
8181
}
8282

83+
<# } #>
84+
<# if (c.GetFeatures().CanSort) { #>
85+
/**
86+
* Sets the order by clause for the request
87+
*
88+
* @param value the sort clause
89+
* @return the updated request
90+
*/
91+
public <#=c.ITypeCollectionReferenceRequest()#> orderBy(final String value) {
92+
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
93+
return (<#=c.TypeCollectionReferenceRequest()#>)this;
94+
}
95+
8396
<# } #>
8497
<# if (c.GetFeatures().CanSelect) { #>
8598
/**

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo
3131
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
3232
}
3333

34-
public void get(final ICallback<<#=c.ITypeCollectionPage()#>> callback) {
34+
public void get(final ICallback<? super <#=c.ITypeCollectionPage()#>> callback) {
3535
final IExecutors executors = getBaseRequest().getClient().getExecutors();
3636
executors.performOnBackground(new Runnable() {
3737
@Override
@@ -50,7 +50,7 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo
5050
return buildFromResponse(response);
5151
}
5252

53-
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) {
53+
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<? super <#=c.TypeName()#>> callback) {
5454
final String requestUrl = getBaseRequest().getRequestUrl().toString();
5555
new <#=c.TypeRequestBuilder()#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
5656
.buildRequest(getBaseRequest().getHeaders())
@@ -89,6 +89,19 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo
8989
return (<#=c.TypeCollectionRequest()#>)this;
9090
}
9191

92+
<# } #>
93+
<# if (c.GetFeatures().CanSort) { #>
94+
/**
95+
* Sets the order by clause for the request
96+
*
97+
* @param value the order by clause
98+
* @return the updated request
99+
*/
100+
public <#=c.ITypeCollectionRequest()#> orderBy(final String value) {
101+
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
102+
return (<#=c.TypeCollectionRequest()#>)this;
103+
}
104+
92105
<# } #>
93106
<# if (c.GetFeatures().CanSelect) { #>
94107
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ import <#=importNamespace#>.http.BaseCollectionPage;
2626
* @param builder the request builder for the next collection page
2727
*/
2828
public <#=c.TypeCollectionWithReferencesPage()#>(final <#=c.TypeCollectionResponse()#> response, final <#=c.ITypeCollectionWithReferencesRequestBuilder()#> builder) {
29-
super(response.value, builder);
29+
super(response.value, builder, response.additionalDataManager());
3030
}
3131
}

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

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import <#=importNamespace#>.concurrency.IExecutors;
2525
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2626
}
2727

28-
public void get(final ICallback<<#=c.ITypeCollectionWithReferencesPage()#>> callback) {
28+
public void get(final ICallback<? super <#=c.ITypeCollectionWithReferencesPage()#>> callback) {
2929
final IExecutors executors = getBaseRequest().getClient().getExecutors();
3030
executors.performOnBackground(new Runnable() {
3131
@Override
@@ -45,37 +45,44 @@ import <#=importNamespace#>.concurrency.IExecutors;
4545
}
4646

4747
<# if (c.GetFeatures().CanExpand) { #>
48-
public <#=c.ITypeCollectionRequest()#> expand(final String value) {
48+
public <#=c.ITypeCollectionWithReferencesRequest()#> expand(final String value) {
4949
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
50-
return (<#=c.TypeCollectionRequest()#>)this;
50+
return this;
5151
}
5252

5353
<# } #>
5454
<# if (c.GetFeatures().CanFilter) { #>
55-
public <#=c.ITypeCollectionRequest()#> filter(final String value) {
55+
public <#=c.ITypeCollectionWithReferencesRequest()#> filter(final String value) {
5656
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
57-
return (<#=c.TypeCollectionRequest()#>)this;
57+
return this;
58+
}
59+
60+
<# } #>
61+
<# if (c.GetFeatures().CanSort) { #>
62+
public <#=c.ITypeCollectionWithReferencesRequest()#> orderBy(final String value) {
63+
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
64+
return this;
5865
}
5966

6067
<# } #>
6168
<# if (c.GetFeatures().CanSelect) { #>
62-
public <#=c.ITypeCollectionRequest()#> select(final String value) {
69+
public <#=c.ITypeCollectionWithReferencesRequest()#> select(final String value) {
6370
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
64-
return (<#=c.TypeCollectionRequest()#>)this;
71+
return this;
6572
}
6673

6774
<# } #>
6875
<# if (c.GetFeatures().CanUseTop) { #>
69-
public <#=c.ITypeCollectionRequest()#> top(final int value) {
76+
public <#=c.ITypeCollectionWithReferencesRequest()#> top(final int value) {
7077
addQueryOption(new com.microsoft.graph.options.QueryOption("$top", value + ""));
71-
return (<#=c.TypeCollectionRequest()#>)this;
78+
return this;
7279
}
7380

7481
<# } #>
7582
public <#=c.ITypeCollectionWithReferencesPage()#> buildFromResponse(final <#=c.TypeCollectionResponse()#> response) {
76-
final <#=c.ITypeCollectionRequestBuilder()#> builder;
83+
final <#=c.ITypeCollectionWithReferencesRequestBuilder()#> builder;
7784
if (response.nextLink != null) {
78-
builder = new <#=c.TypeCollectionRequestBuilder()#>(response.nextLink, getBaseRequest().getClient(), /* options */ null);
85+
builder = new <#=c.TypeCollectionWithReferencesRequestBuilder()#>(response.nextLink, getBaseRequest().getClient(), /* options */ null);
7986
} else {
8087
builder = null;
8188
}

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import <#=importNamespace#>.core.IBaseClient;
2525
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
2626
}
2727

28-
public void delete(final ICallback<<#=c.TypeName()#>> callback) {
28+
public void delete(final ICallback<? super <#=c.TypeName()#>> callback) {
2929
send(HttpMethod.DELETE, callback, null);
3030
}
3131

@@ -58,26 +58,14 @@ import <#=importNamespace#>.core.IBaseClient;
5858
return (<#=c.TypeReferenceRequest()#>)this;
5959
}
6060
<# } #>
61-
<# if (c.GetFeatures().CanFilter) { #>
62-
/**
63-
* Sets the filter clause for the request
64-
*
65-
* @param value the filter clause
66-
* @return the updated request
67-
*/
68-
public <#=c.ITypeReferenceRequest()#> filter(final String value) {
69-
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
70-
return (<#=c.TypeReferenceRequest()#>)this;
71-
}
72-
<# } #>
7361
<# if (c.GetFeatures().CanUpdate) { #>
7462
/**
7563
* Puts the <#=c.TypeName()#>
7664
*
7765
* @param src<#=c.TypeName()#> the <#=c.TypeName()#> reference to PUT
7866
* @param callback the callback to be called after success or failure
7967
*/
80-
public void put(<#=c.TypeName()#> src<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) {
68+
public void put(<#=c.TypeName()#> src<#=c.TypeName()#>, final ICallback<? super <#=c.TypeName()#>> callback) {
8169
send(HttpMethod.PUT, callback, src<#=c.TypeName()#>);
8270
}
8371

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

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,6 @@ import <#=importNamespace#>.http.HttpMethod;
9898
return (<#=c.TypeRequest()#>)this;
9999
}
100100

101-
<# } #>
102-
<# if (c.GetFeatures().CanFilter) { #>
103-
/**
104-
* Sets the filter clause for the request
105-
*
106-
* @param value the filter clause
107-
* @return the updated request
108-
*/
109-
public <#=c.ITypeRequest()#> filter(final String value) {
110-
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
111-
return (<#=c.TypeRequest()#>)this;
112-
}
113-
114101
<# } #>
115102
<# if (c.AsOdcmProperty() != null && c.AsOdcmProperty().IsCollection && c.GetFeatures().CanUseTop) { #>
116103

@@ -137,7 +124,7 @@ import <#=importNamespace#>.http.HttpMethod;
137124
*
138125
* @param callback the callback when the deletion action has completed
139126
*/
140-
public void delete(final ICallback<{0}> callback) {{
127+
public void delete(final ICallback<? super {0}> callback) {{
141128
send(HttpMethod.DELETE, callback, null);
142129
}}
143130

@@ -162,7 +149,7 @@ import <#=importNamespace#>.http.HttpMethod;
162149
*
163150
* @param callback the callback to be called after success or failure
164151
*/
165-
public void get(final ICallback<{0}> callback) {{
152+
public void get(final ICallback<? super {0}> callback) {{
166153
send(HttpMethod.GET, callback, null);
167154
}}
168155

@@ -189,7 +176,7 @@ import <#=importNamespace#>.http.HttpMethod;
189176
* @param source{0} the source object with updates
190177
* @param callback the callback to be called after success or failure
191178
*/
192-
public void patch(final {0} source{0}, final ICallback<{0}> callback) {{
179+
public void patch(final {0} source{0}, final ICallback<? super {0}> callback) {{
193180
send(HttpMethod.PATCH, callback, source{0});
194181
}}
195182

@@ -217,7 +204,7 @@ import <#=importNamespace#>.http.HttpMethod;
217204
* @param new{0} the new object to create
218205
* @param callback the callback to be called after success or failure
219206
*/
220-
public void post(final {0} new{0}, final ICallback<{0}> callback) {{
207+
public void post(final {0} new{0}, final ICallback<? super {0}> callback) {{
221208
send(HttpMethod.POST, callback, new{0});
222209
}}
223210

@@ -245,7 +232,7 @@ import <#=importNamespace#>.http.HttpMethod;
245232
* @param new{0} the object to create/update
246233
* @param callback the callback to be called after success or failure
247234
*/
248-
public void put(final {0} new{0}, final ICallback<{0}> callback) {{
235+
public void put(final {0} new{0}, final ICallback<? super {0}> callback) {{
249236
send(HttpMethod.PUT, callback, new{0});
250237
}}
251238

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ if (c.AsOdcmClass() != null)
6868
if (prop.IsCollection()) {
6969
#>
7070
public <#=prop.ITypeCollectionRequestBuilder()#> <#=sanitizedProperty#>() {
71-
return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.Name#>"), getClient(), null);
71+
return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
7272
}
7373

7474
public <#=prop.ITypeRequestBuilder()#> <#=sanitizedProperty#>(final String id) {
75-
return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.Name#>") + "/" + id, getClient(), null);
75+
return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
7676
}
7777
<#
7878
} else {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ if (c.AsOdcmClass() != null)
5050
if (prop.IsCollection()) {
5151
#>
5252
public <#=prop.ITypeCollectionRequestBuilder()#> <#=prop.Name#>() {
53-
return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.Name#>"), getClient(), null);
53+
return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
5454
}
5555

5656
public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>(final String id) {
57-
return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.Name#>") + "/" + id, getClient(), null);
57+
return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
5858
}
5959
<#
6060
} else {

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import <#=importNamespace#>.serializer.IJsonBackedObject;
2626
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
2727
}
2828

29-
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final IJsonBackedObject payload, final ICallback<<#=c.TypeName()#>> callback) {
29+
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final IJsonBackedObject payload, final ICallback<? super <#=c.TypeName()#>> callback) {
3030
send(HttpMethod.POST, callback, payload);
3131
}
3232

@@ -38,23 +38,23 @@ import <#=importNamespace#>.serializer.IJsonBackedObject;
3838
return null;
3939
}
4040

41-
public void get(final ICallback<<#=c.TypeName()#>> callback) {
41+
public void get(final ICallback<? super <#=c.TypeName()#>> callback) {
4242
send(HttpMethod.GET, callback, null);
4343
}
4444

4545
public <#=c.TypeName()#> get() throws ClientException {
4646
return send(HttpMethod.GET, null);
4747
}
4848

49-
public void delete(final ICallback<<#=c.TypeName()#>> callback) {
49+
public void delete(final ICallback<? super <#=c.TypeName()#>> callback) {
5050
send(HttpMethod.DELETE, callback, null);
5151
}
5252

5353
public void delete() throws ClientException {
5454
send(HttpMethod.DELETE, null);
5555
}
5656

57-
public void patch(final <#=c.TypeName()#> source<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) {
57+
public void patch(final <#=c.TypeName()#> source<#=c.TypeName()#>, final ICallback<? super <#=c.TypeName()#>> callback) {
5858
send(HttpMethod.PATCH, callback, source<#=c.TypeName()#>);
5959
}
6060

@@ -88,16 +88,4 @@ import <#=importNamespace#>.serializer.IJsonBackedObject;
8888
return (<#=c.TypeWithReferencesRequest()#>)this;
8989
}
9090
<# } #>
91-
<# if (c.GetFeatures().CanFilter) { #>
92-
/**
93-
* Sets the filter clause for the request
94-
*
95-
* @param value the filter clause
96-
* @return the updated request
97-
*/
98-
public <#=c.ITypeWithReferencesRequest()#> filter(final String value) {
99-
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
100-
return (<#=c.TypeWithReferencesRequest()#>)this;
101-
}
102-
<# } #>
10391
}

0 commit comments

Comments
 (0)