Skip to content

Commit c5ce5d5

Browse files
baywetbaywet
authored
Merge pull request #299 from microsoftgraph/feature/java-super-callbacks
feature/java super callbacks
2 parents ccfd990 + 956d6fb commit c5ce5d5

File tree

117 files changed

+370
-370
lines changed

Some content is hidden

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

117 files changed

+370
-370
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ 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) {
30+
public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<? super <#=c.TypeName()#>> callback) {
3131
<#
3232
var navigationProperty = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType(((CustomT4Host)Host).CurrentModel);
3333
if (navigationProperty != null) {

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

Lines changed: 2 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())

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

Lines changed: 1 addition & 1 deletion
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

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

Lines changed: 2 additions & 2 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

@@ -77,7 +77,7 @@ import <#=importNamespace#>.core.IBaseClient;
7777
* @param src<#=c.TypeName()#> the <#=c.TypeName()#> reference to PUT
7878
* @param callback the callback to be called after success or failure
7979
*/
80-
public void put(<#=c.TypeName()#> src<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) {
80+
public void put(<#=c.TypeName()#> src<#=c.TypeName()#>, final ICallback<? super <#=c.TypeName()#>> callback) {
8181
send(HttpMethod.PUT, callback, src<#=c.TypeName()#>);
8282
}
8383

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ import <#=importNamespace#>.http.HttpMethod;
137137
*
138138
* @param callback the callback when the deletion action has completed
139139
*/
140-
public void delete(final ICallback<{0}> callback) {{
140+
public void delete(final ICallback<? super {0}> callback) {{
141141
send(HttpMethod.DELETE, callback, null);
142142
}}
143143

@@ -162,7 +162,7 @@ import <#=importNamespace#>.http.HttpMethod;
162162
*
163163
* @param callback the callback to be called after success or failure
164164
*/
165-
public void get(final ICallback<{0}> callback) {{
165+
public void get(final ICallback<? super {0}> callback) {{
166166
send(HttpMethod.GET, callback, null);
167167
}}
168168

@@ -189,7 +189,7 @@ import <#=importNamespace#>.http.HttpMethod;
189189
* @param source{0} the source object with updates
190190
* @param callback the callback to be called after success or failure
191191
*/
192-
public void patch(final {0} source{0}, final ICallback<{0}> callback) {{
192+
public void patch(final {0} source{0}, final ICallback<? super {0}> callback) {{
193193
send(HttpMethod.PATCH, callback, source{0});
194194
}}
195195

@@ -217,7 +217,7 @@ import <#=importNamespace#>.http.HttpMethod;
217217
* @param new{0} the new object to create
218218
* @param callback the callback to be called after success or failure
219219
*/
220-
public void post(final {0} new{0}, final ICallback<{0}> callback) {{
220+
public void post(final {0} new{0}, final ICallback<? super {0}> callback) {{
221221
send(HttpMethod.POST, callback, new{0});
222222
}}
223223

@@ -245,7 +245,7 @@ import <#=importNamespace#>.http.HttpMethod;
245245
* @param new{0} the object to create/update
246246
* @param callback the callback to be called after success or failure
247247
*/
248-
public void put(final {0} new{0}, final ICallback<{0}> callback) {{
248+
public void put(final {0} new{0}, final ICallback<? super {0}> callback) {{
249249
send(HttpMethod.PUT, callback, new{0});
250250
}}
251251

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

Lines changed: 4 additions & 4 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import <#=importNamespace#>.http.HttpMethod;
5959
body = new <#=c.TypeBody()#>();
6060
}
6161

62-
public void post(final ICallback<<#=returnType#>> callback) {
62+
public void post(final ICallback<? super <#=returnType#>> callback) {
6363
send(HttpMethod.POST, callback, body);
6464
}
6565

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import <#=importNamespace#>.concurrency.IExecutors;
4747

4848
<# if (c.AsOdcmMethod().IsAction()) { #>
4949

50-
public void post(final ICallback<<#=c.ITypeCollectionPage()#>> callback) {
50+
public void post(final ICallback<? super <#=c.ITypeCollectionPage()#>> callback) {
5151
final IExecutors executors = getBaseRequest().getClient().getExecutors();
5252
executors.performOnBackground(new Runnable() {
5353
@Override
@@ -72,7 +72,7 @@ import <#=importNamespace#>.concurrency.IExecutors;
7272

7373
<# } else { #>
7474

75-
public void get(final ICallback<<#=c.ITypeCollectionPage()#>> callback) {
75+
public void get(final ICallback<? super <#=c.ITypeCollectionPage()#>> callback) {
7676
final IExecutors executors = getBaseRequest().getClient().getExecutors();
7777
executors.performOnBackground(new Runnable() {
7878
@Override

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if (c.AsOdcmMethod().IsAction()) {
3535
*
3636
* @param callback the callback to be called after success or failure
3737
*/
38-
public void post(final ICallback<<#=c.ReturnType()#>> callback) {
38+
public void post(final ICallback<? super <#=c.ReturnType()#>> callback) {
3939
send(HttpMethod.POST, callback, null);
4040
}
4141

@@ -154,7 +154,7 @@ if (c.AsOdcmMethod().IsAction()) {
154154
* @param src<#=c.ReturnType()#> the <#=c.ReturnType()#> with which to PATCH
155155
* @param callback the callback to be called after success or failure
156156
*/
157-
public void patch(<#=c.ReturnType()#> src<#=c.ReturnType()#>, final ICallback<<#=c.ReturnType()#>> callback) {
157+
public void patch(<#=c.ReturnType()#> src<#=c.ReturnType()#>, final ICallback<? super <#=c.ReturnType()#>> callback) {
158158
send(HttpMethod.PATCH, callback, src<#=c.ReturnType()#>);
159159
}
160160

@@ -175,7 +175,7 @@ if (c.AsOdcmMethod().IsAction()) {
175175
* @param src<#=c.ReturnType()#> the <#=c.ReturnType()#> to PUT
176176
* @param callback the callback to be called after success or failure
177177
*/
178-
public void put(<#=c.ReturnType()#> src<#=c.ReturnType()#>, final ICallback<<#=c.ReturnType()#>> callback) {
178+
public void put(<#=c.ReturnType()#> src<#=c.ReturnType()#>, final ICallback<? super <#=c.ReturnType()#>> callback) {
179179
send(HttpMethod.PUT, callback, src<#=c.ReturnType()#>);
180180
}
181181

@@ -197,7 +197,7 @@ if (c.AsOdcmMethod().IsAction()) {
197197
*
198198
* @param callback the callback to be called after success or failure
199199
*/
200-
public void get(final ICallback<<#=c.ReturnType()#>> callback) {
200+
public void get(final ICallback<? super <#=c.ReturnType()#>> callback) {
201201
send(HttpMethod.GET, callback, null);
202202
}
203203

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import java.io.InputStream;
4949
* @param fileContents the contents of the stream to upload
5050
* @param callback the callback to be called after success or failure
5151
*/
52-
public void put(final byte[] fileContents, final ICallback<<#=c.ClassTypeName()#>> callback) {
52+
public void put(final byte[] fileContents, final ICallback<? super <#=c.ClassTypeName()#>> callback) {
5353
send(fileContents, callback);
5454
}
5555

0 commit comments

Comments
 (0)