- non-generated code sync with v1

Author: baywet

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

@@ -168,14 +168,20 @@ public void upload(final List<Option> options,
         byte[] buffer = new byte[chunkSize];
 
         while (this.readSoFar < this.streamSize) {
-            int read = this.inputStream.read(buffer);
-
-            if (read == -1) {
-                break;
+            int buffRead = 0;
+
+            // inner loop is to work-around the case where read buffer size is limited to less than chunk size by a global setting
+            while (buffRead < chunkSize) {
+                int read = 0;
+                read = this.inputStream.read(buffer, buffRead, chunkSize - buffRead);
+                if (read == -1) {
+                    break;
+                }
+                buffRead += read;
             }
 
             ChunkedUploadRequest request =
-                    new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, read,
+                    new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, buffRead,
                             maxRetry, this.readSoFar, this.streamSize);
             ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
 
@@ -190,7 +196,7 @@ public void upload(final List<Option> options,
                 break;
             }
 
-            this.readSoFar += read;
+            this.readSoFar += buffRead;
         }
     }
 

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

@@ -31,7 +31,7 @@ public class ChunkedUploadRequest {
     /**
      * The seconds for retry delay.
      */
-    private static final int RETRY_DELAY = 2 * 1000;
+    private static final long RETRY_DELAY = 2000L; // 2 seconds
 
     /**
      * The chunk data sent to the server.
@@ -46,12 +46,12 @@ public class ChunkedUploadRequest {
     /**
      * The max retry for a single request.
      */
-    private final int maxRetry;
+    private final long maxRetry;
 
     /**
      * The retry counter.
      */
-    private int retryCount;
+    private long retryCount;
 
     /**
      * Construct the ChunkedUploadRequest
@@ -75,8 +75,8 @@ public ChunkedUploadRequest(final String requestUrl,
                                 final long totalLength) {
         this.data = new byte[chunkSize];
         System.arraycopy(chunk, 0, this.data, 0, chunkSize);
-        this.retryCount = 0;
-        this.maxRetry = maxRetry;
+        this.retryCount = 0L;
+        this.maxRetry = (long)maxRetry;
         this.baseRequest = new BaseRequest(requestUrl, client, options, ChunkedUploadResult.class) {
         };
         this.baseRequest.setHttpMethod(HttpMethod.PUT);