Skip to content

fix: include one-byte final upload slices #2164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vinay Kumar (Vcode2407) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: include one-byte final upload slices #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/core/tasks/LargeFileUploadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ protected List<UploadSliceRequestBuilder<T>> getUploadSliceRequests() {
for (Map.Entry<Long, Long> entry: rangesRemaining) {
long currentRangeBegin = entry.getKey();
long currentEnd = entry.getValue();
while(currentRangeBegin < currentEnd) {
while(currentRangeBegin <= currentEnd) {
long nextSliceSize = nextSliceSize(currentRangeBegin, currentEnd);
UploadSliceRequestBuilder<T> sliceRequestBuilder =
new UploadSliceRequestBuilder<>(this.uploadSession.getUploadUrl(), this.requestAdapter,
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/com/microsoft/graph/core/tasks/LargeFileUploadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.mockito.internal.matchers.Any;

Expand Down Expand Up @@ -115,6 +116,27 @@ void BreakStreamIntoCorrectRanges() throws IOException, NoSuchFieldException, Il
assertEquals(size%maxSliceSize, lastSlice.getRangeLength());
assertEquals(size-1, lastSlice.getRangeEnd());
}
@Test
void includesOneByteFinalSlice() throws IOException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
UploadSession session = new UploadSession();
session.setNextExpectedRanges(Arrays.asList("0-"));
session.setUploadUrl("http://localhost");
session.setExpirationDateTime(OffsetDateTime.parse("2019-11-07T06:39:31.499Z"));

int sliceSize = 320 * 1024;
byte[] data = new byte[sliceSize + 1];
LargeFileUploadTask<TestDriveItem> task = new LargeFileUploadTask<>(adapter, session,
new ByteArrayInputStream(data), data.length, sliceSize, TestDriveItem::createFromDiscriminatorValue);

List<UploadSliceRequestBuilder<TestDriveItem>> builders = task.getUploadSliceRequests();

assertEquals(2, builders.size());
UploadSliceRequestBuilder<TestDriveItem> finalSlice = builders.get(1);
assertEquals(sliceSize, finalSlice.getRangeBegin());
assertEquals(sliceSize, finalSlice.getRangeEnd());
assertEquals(1, finalSlice.getRangeLength());
}

// Test for chunkInputStream method with a 5MB file
@Test
void uploads5MBFileSuccessfully() throws Exception {
Expand Down