11package com .microsoft .graph .core .tasks ;
22
3+ import java .io .ByteArrayInputStream ;
4+ import java .io .IOException ;
5+ import java .io .InputStream ;
6+ import java .lang .reflect .InvocationTargetException ;
7+ import java .time .OffsetDateTime ;
8+ import java .util .AbstractMap ;
9+ import java .util .ArrayList ;
10+ import java .util .List ;
11+ import java .util .Locale ;
12+ import java .util .Map ;
13+ import java .util .Objects ;
14+ import java .util .concurrent .CancellationException ;
15+ import java .util .concurrent .TimeUnit ;
16+ import java .util .function .Consumer ;
17+
18+ import javax .annotation .Nonnull ;
19+ import javax .annotation .Nullable ;
20+
321import com .microsoft .graph .core .ErrorConstants ;
422import com .microsoft .graph .core .exceptions .ClientException ;
523import com .microsoft .graph .core .models .IProgressCallback ;
1836import com .microsoft .kiota .serialization .Parsable ;
1937import com .microsoft .kiota .serialization .ParsableFactory ;
2038import com .microsoft .kiota .serialization .ParseNode ;
21- import okhttp3 .OkHttpClient ;
2239
23- import jakarta .annotation .Nonnull ;
24- import jakarta .annotation .Nullable ;
25- import java .io .ByteArrayInputStream ;
26- import java .io .IOException ;
27- import java .io .FileInputStream ;
28- import java .lang .reflect .InvocationTargetException ;
29- import java .time .OffsetDateTime ;
30- import java .util .*;
31- import java .util .concurrent .CancellationException ;
32- import java .util .concurrent .TimeUnit ;
33- import java .util .function .Consumer ;
34- import java .nio .ByteBuffer ;
35- import java .nio .channels .FileChannel ;
40+ import okhttp3 .OkHttpClient ;
3641
3742/**
3843 * Task for uploading large files including pausing and resuming.
@@ -43,7 +48,7 @@ public class LargeFileUploadTask<T extends Parsable > {
4348 private static final long DEFAULT_MAX_SLICE_SIZE = (long ) 5 *1024 *1024 ;
4449 private IUploadSession uploadSession ;
4550 private final RequestAdapter requestAdapter ;
46- private final FileInputStream uploadStream ;
51+ private final InputStream uploadStream ;
4752 private final long maxSliceSize ;
4853 private ArrayList <AbstractMap .SimpleEntry <Long , Long >> rangesRemaining ;
4954 private final long totalUploadLength ;
@@ -63,7 +68,7 @@ public class LargeFileUploadTask<T extends Parsable > {
6368 */
6469 public LargeFileUploadTask (@ Nullable final RequestAdapter requestAdapter ,
6570 @ Nonnull Parsable uploadSession ,
66- @ Nonnull FileInputStream uploadStream ,
71+ @ Nonnull InputStream uploadStream ,
6772 long streamSize ,
6873 @ Nonnull ParsableFactory <T > factory ) throws IllegalAccessException , IOException , InvocationTargetException , NoSuchMethodException {
6974 this (requestAdapter , uploadSession ,uploadStream , streamSize ,DEFAULT_MAX_SLICE_SIZE , factory );
@@ -83,7 +88,7 @@ public LargeFileUploadTask(@Nullable final RequestAdapter requestAdapter,
8388 */
8489 public LargeFileUploadTask (@ Nullable final RequestAdapter requestAdapter ,
8590 @ Nonnull Parsable uploadSession ,
86- @ Nonnull FileInputStream uploadStream ,
91+ @ Nonnull InputStream uploadStream ,
8792 long streamSize ,
8893 long maxSliceSize ,
8994 @ Nonnull ParsableFactory <T > factory ) throws IllegalAccessException , IOException , InvocationTargetException , NoSuchMethodException {
@@ -139,7 +144,7 @@ public UploadResult<T> upload(int maxTries, @Nullable IProgressCallback progress
139144 return result ;
140145 }
141146 }
142- updateSessionStatus ();
147+ // updateSessionStatus();
143148 uploadTries += 1 ;
144149 if (uploadTries < maxTries ) {
145150 TimeUnit .SECONDS .sleep ((long ) 2 * uploadTries * uploadTries );
@@ -203,7 +208,7 @@ public IUploadSession updateSessionStatus() {
203208 return session ;
204209 }
205210 private UploadResult <T > uploadSlice (UploadSliceRequestBuilder <T > uploadSliceRequestBuilder , ArrayList <Throwable > exceptionsList ) throws IOException {
206- byte [] buffer = chunkInputStream (uploadStream ,( int ) uploadSliceRequestBuilder . getRangeBegin (), (int )uploadSliceRequestBuilder .getRangeLength ());
211+ byte [] buffer = chunkInputStream (uploadStream , (int )uploadSliceRequestBuilder .getRangeLength ());
207212 ByteArrayInputStream chunkStream = new ByteArrayInputStream (buffer );
208213 try {
209214 return uploadSliceRequestBuilder .put (chunkStream );
@@ -277,12 +282,9 @@ private long nextSliceSize(long rangeBegin, long rangeEnd) {
277282 long size = rangeEnd - rangeBegin + 1 ;
278283 return Math .min (size , this .maxSliceSize );
279284 }
280- private byte [] chunkInputStream (FileInputStream stream , int begin , int length ) throws IOException {
281- ByteBuffer byteBuffer = ByteBuffer .allocate (length );
282- int lengthAssert = stream .getChannel ().read (byteBuffer );
283- byteBuffer .flip ();
284- byte [] buffer = byteBuffer .array ();
285- byteBuffer .clear ();
285+ private byte [] chunkInputStream (InputStream stream , int length ) throws IOException {
286+ byte [] buffer = new byte [length ];
287+ int lengthAssert = stream .read (buffer );
286288 assert lengthAssert == length ;
287289 return buffer ;
288290 }
0 commit comments