Skip to content

Commit 969ba11

Browse files
committed
- fixes super callback casting
1 parent 6df0aeb commit 969ba11

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151

5252
/**
5353
* HTTP provider based off of URLConnection
54+
* @deprecated user CoreHttpProvider instead
5455
*/
56+
@Deprecated
5557
public class DefaultHttpProvider implements IHttpProvider {
5658

5759
/**
@@ -160,9 +162,9 @@ public <Result, Body> void send(final IHttpRequest request,
160162
final ICallback<? super Result> callback,
161163
final Class<Result> resultClass,
162164
final Body serializable) {
163-
final IProgressCallback<Result> progressCallback;
165+
final IProgressCallback<? super Result> progressCallback;
164166
if (callback instanceof IProgressCallback) {
165-
progressCallback = (IProgressCallback<Result>) callback;
167+
progressCallback = (IProgressCallback<? super Result>) callback;
166168
} else {
167169
progressCallback = null;
168170
}
@@ -241,7 +243,7 @@ public <Result, Body, DeserializeType> Result send(final IHttpRequest request,
241243
private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRequest request,
242244
final Class<Result> resultClass,
243245
final Body serializable,
244-
final IProgressCallback<Result> progress,
246+
final IProgressCallback<? super Result> progress,
245247
final IStatefulResponseHandler<Result, DeserializeType> handler)
246248
throws ClientException {
247249
final int defaultBufferSize = 4096;
@@ -535,7 +537,7 @@ public void setConnectionConfig(IConnectionConfig connectionConfig) {
535537

536538
@Override
537539
public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Result> resultClass,
538-
BodyType serializable, IProgressCallback<Result> progress) throws ClientException {
540+
BodyType serializable, IProgressCallback<? super Result> progress) throws ClientException {
539541
return null;
540542
}
541543
}

src/main/java/com/microsoft/graph/http/IHttpProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ <Result, BodyType, DeserializeType> Result send(final IHttpRequest request,
123123
<Result, BodyType> Request getHttpRequest(final IHttpRequest request,
124124
final Class<Result> resultClass,
125125
final BodyType serializable,
126-
final IProgressCallback<Result> progress)
126+
final IProgressCallback<? super Result> progress)
127127
throws ClientException;
128128
}

src/test/java/com/microsoft/graph/http/MockHttpProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void setConnectionConfig(IConnectionConfig connectionConfig) {
129129

130130
@Override
131131
public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Result> resultClass,
132-
BodyType serializable, IProgressCallback<Result> progress) throws ClientException {
132+
BodyType serializable, IProgressCallback<? super Result> progress) throws ClientException {
133133
return null;
134134
}
135135
}

src/test/java/com/microsoft/graph/requests/extensions/GraphServiceClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void setConnectionConfig(IConnectionConfig connectionConfig) {
207207

208208
@Override
209209
public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Result> resultClass,
210-
BodyType serializable, IProgressCallback<Result> progress) throws ClientException {
210+
BodyType serializable, IProgressCallback<? super Result> progress) throws ClientException {
211211
return null;
212212
}
213213
};

0 commit comments

Comments
 (0)