Skip to content

Commit 689b312

Browse files
author
Caitlin Bales (MSFT)
committed
ChunkedUpload parameters
1 parent 4cecee1 commit 689b312

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public void upload(final List<Option> options,
177177
ChunkedUploadRequest request =
178178
new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, read,
179179
maxRetry, this.readSoFar, this.streamSize);
180-
ChunkedUploadResult result = request.upload(this.responseHandler);
180+
ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
181181

182182
if (result.uploadCompleted()) {
183183
callback.progress(this.streamSize, this.streamSize);

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void configConnection(final IConnection connection) {
7878
* @throws Exception An exception occurs if the request was unable to complete for any reason.
7979
*/
8080
@Override
81-
public ChunkedUploadResult generateResult(
81+
public ChunkedUploadResult<UploadType> generateResult(
8282
final IHttpRequest request,
8383
final IConnection connection,
8484
final ISerializer serializer,
@@ -92,7 +92,7 @@ public ChunkedUploadResult generateResult(
9292
final UploadSession seesion = serializer.deserializeObject(
9393
DefaultHttpProvider.streamToString(in), UploadSession.class);
9494

95-
return new ChunkedUploadResult(seesion);
95+
return new ChunkedUploadResult<UploadType>(seesion);
9696

9797
} else if (connection.getResponseCode() == HttpResponseCode.HTTP_CREATED
9898
|| connection.getResponseCode() == HttpResponseCode.HTTP_OK) {
@@ -102,11 +102,11 @@ public ChunkedUploadResult generateResult(
102102
UploadType uploadedItem = serializer.deserializeObject(rawJson,
103103
this.deserializeTypeClass);
104104

105-
return new ChunkedUploadResult(uploadedItem);
105+
return new ChunkedUploadResult<UploadType>(uploadedItem);
106106
} else if (connection.getResponseCode() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
107107
logger.logDebug("Receiving error during upload, see detail on result error");
108108

109-
return new ChunkedUploadResult(
109+
return new ChunkedUploadResult<UploadType>(
110110
GraphServiceException.createFromConnection(request, null, serializer,
111111
connection, logger));
112112
}

src/main/java/com/microsoft/graph/requests/extensions/ChunkedUploadRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public ChunkedUploadRequest(final String requestUrl,
9696
* @param <UploadType> The upload item type.
9797
* @return The upload result.
9898
*/
99-
public <UploadType> ChunkedUploadResult upload(
99+
public <UploadType> ChunkedUploadResult<UploadType> upload(
100100
final ChunkedUploadResponseHandler<UploadType> responseHandler) {
101101
while (this.retryCount < this.maxRetry) {
102102
try {
@@ -105,7 +105,7 @@ public <UploadType> ChunkedUploadResult upload(
105105
throw new ClientException("Exception while waiting to retry file upload.", e);
106106
}
107107

108-
ChunkedUploadResult result = null;
108+
ChunkedUploadResult<UploadType> result = null;
109109

110110
try {
111111
result = this.baseRequest
@@ -123,7 +123,7 @@ public <UploadType> ChunkedUploadResult upload(
123123
this.retryCount++;
124124
}
125125

126-
return new ChunkedUploadResult(
126+
return new ChunkedUploadResult<UploadType>(
127127
new ClientException("Upload session failed too many times.", null));
128128
}
129129
}

0 commit comments

Comments
 (0)