Skip to content

Commit a39b80b

Browse files
committed
- fixes a bug where upload sessions would not deserialize responses properly
1 parent e8d2211 commit a39b80b

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
128128
this.inputStream = inputStream;
129129
this.streamSize = streamSize;
130130
this.uploadUrl = uploadSession.getUploadUrl();
131-
this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass);
131+
this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass, uploadSession.getClass());
132132
}
133133

134134
/**

‎src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ChunkedUploadRequest<UploadType> {
5555
* @param totalLength The total length of the input stream.
5656
*/
5757
@SuppressWarnings("unchecked")
58-
public ChunkedUploadRequest(@Nonnull final String requestUrl,
58+
protected ChunkedUploadRequest(@Nonnull final String requestUrl,
5959
@Nonnull final IBaseClient client,
6060
@Nullable final List<? extends Option> options,
6161
@Nonnull final byte[] chunk,

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,16 @@ public class ChunkedUploadResponseHandler<UploadType>
5656
*/
5757
private final Class<UploadType> deserializeTypeClass;
5858

59+
private final Class<? extends IUploadSession> uploadSessionClass;
5960
/**
6061
* Creates a chunked upload response handler
6162
*
6263
* @param uploadType the expected upload item type
64+
* @param uploadSessionType the type of the upload session
6365
*/
64-
public ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType) {
65-
this.deserializeTypeClass = uploadType;
66+
protected ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType, @Nonnull final Class<? extends IUploadSession> uploadSessionType) {
67+
this.deserializeTypeClass = uploadType;
68+
this.uploadSessionClass = uploadSessionType;
6669
}
6770

6871
/**
@@ -107,7 +110,7 @@ public ChunkedUploadResult<UploadType> generateResult(
107110
&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
108111
try (final InputStream in = new BufferedInputStream(response.body().byteStream())) {
109112
final String rawJson = CoreHttpProvider.streamToString(in);
110-
final IUploadSession session = serializer.deserializeObject(rawJson, IUploadSession.class);
113+
final IUploadSession session = serializer.deserializeObject(rawJson, uploadSessionClass);
111114
if(session == null || session.getNextExpectedRanges() == null) {
112115
logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
113116
final UploadType uploadedItem = serializer.deserializeObject(rawJson, this.deserializeTypeClass);

‎src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ChunkedUploadResult<UploadType> {
3434
*
3535
* @param uploaded The created item.
3636
*/
37-
public ChunkedUploadResult(@Nullable final UploadType uploaded) {
37+
protected ChunkedUploadResult(@Nullable final UploadType uploaded) {
3838
this.uploadedItem = uploaded;
3939
this.session = null;
4040
this.error = null;
@@ -45,7 +45,7 @@ public ChunkedUploadResult(@Nullable final UploadType uploaded) {
4545
*
4646
* @param session The next session.
4747
*/
48-
public ChunkedUploadResult(@Nullable final IUploadSession session) {
48+
protected ChunkedUploadResult(@Nullable final IUploadSession session) {
4949
this.session = session;
5050
this.uploadedItem = null;
5151
this.error = null;
@@ -56,7 +56,7 @@ public ChunkedUploadResult(@Nullable final IUploadSession session) {
5656
*
5757
* @param error The error occurred during uploading.
5858
*/
59-
public ChunkedUploadResult(@Nullable final ClientException error) {
59+
protected ChunkedUploadResult(@Nullable final ClientException error) {
6060
this.error = error;
6161
this.uploadedItem = null;
6262
this.session = null;
@@ -67,7 +67,7 @@ public ChunkedUploadResult(@Nullable final ClientException error) {
6767
*
6868
* @param exception The exception received from server.
6969
*/
70-
public ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
70+
protected ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
7171
this(new ClientException(exception.getMessage(/* verbose */ true), exception));
7272
}
7373

0 commit comments

Comments
 (0)