Fix for issue 1517 and correction of two tests not respecting the REST reference (impacted by the fix)

src/main/java/com/microsoft/graph/core/requests/upload/UploadResponseHandler.java

@@ -56,15 +56,16 @@ public <T extends Parsable> UploadResult<T> handleResponse(@Nonnull final Respon
             }
             try(final InputStream in = body.byteStream()){
                 final String contentType = body.contentType().toString().split(";")[0]; //contentType.toString() returns in format <mediaType>;<charset>, we only want the mediaType.
+                int responseCode = response.code();
                 if(!response.isSuccessful()) {
                     throw new ApiExceptionBuilder()
                             .withMessage(ErrorConstants.Codes.GENERAL_EXCEPTION)
-                            .withResponseStatusCode(response.code())
+                            .withResponseStatusCode(responseCode)
                             .withResponseHeaders(HeadersCompatibility.getResponseHeaders(response.headers()))
                             .build();
                 }
                 UploadResult<T> uploadResult = new UploadResult<>();
-                if (response.code() == HttpURLConnection.HTTP_CREATED) {
+                if (responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_OK) {
                     if (body.contentLength() > 0) {
                         final ParseNode uploadTypeParseNode = parseNodeFactory.getParseNode(contentType, in);
                         uploadResult.itemResponse = uploadTypeParseNode.getObjectValue(factory);

src/test/java/com/microsoft/graph/core/requests/upload/UploadResponseHandlerTest.java

@@ -51,6 +51,36 @@ void GetUploadItemOnCompletedUpload() {
         assertEquals("largeFile.vhd", item.name);
         assertEquals(33, item.size);
     }
+
+    @Test
+    void GetUploadItemOnCompletedUpdate() {
+        registry.contentTypeAssociatedFactories.put(CoreConstants.MimeTypeNames.APPLICATION_JSON, new JsonParseNodeFactory());
+
+        UploadResponseHandler responseHandler = new UploadResponseHandler(null);
+        ResponseBody body = ResponseBody.create("{\n" +
+                "   \"id\": \"912310013A123\",\n" +
+                "   \"name\": \"largeFile.vhd\",\n" +
+                "   \"size\": 33\n" +
+                "}"
+            , MediaType.parse(CoreConstants.MimeTypeNames.APPLICATION_JSON));
+        Response response = new Response.Builder()
+            .request(mock(Request.class))
+            .protocol(mock(Protocol.class))
+            .body(body)
+            .code(HttpURLConnection.HTTP_OK)
+            .message("OK")
+            .build();
+        UploadResult<TestDriveItem> result = responseHandler
+            .handleResponse(response, TestDriveItem::createFromDiscriminatorValue);
+        responseHandler.handleResponse(response, parseNode -> {return new TestDriveItem();});
+        TestDriveItem item = result.itemResponse;
+        assertTrue(result.isUploadSuccessful());
+        assertNotNull(item);
+        assertEquals("912310013A123", item.id);
+        assertEquals("largeFile.vhd", item.name);
+        assertEquals(33, item.size);
+    }
+
     @Test
     void getFileAttachmentLocationOnCompletedUpload() {
         registry.contentTypeAssociatedFactories.put(CoreConstants.MimeTypeNames.APPLICATION_JSON, new JsonParseNodeFactory());
@@ -89,9 +119,9 @@ void getUploadSessionOnProgressingUpload() {
         Response response = new Response.Builder()
             .request(mock(Request.class))
             .protocol(mock(Protocol.class))
-            .message("OK")
+            .message("Accepted")
             .body(body)
-            .code(HttpURLConnection.HTTP_OK)
+            .code(HttpURLConnection.HTTP_ACCEPTED)
             .build();
         UploadResult<TestDriveItem> result = responseHandler
             .handleResponse(response, TestDriveItem::createFromDiscriminatorValue);
@@ -105,6 +135,7 @@ void getUploadSessionOnProgressingUpload() {
         assertEquals("77829-99375", session.getNextExpectedRanges().get(1));
         assertEquals(2, session.getNextExpectedRanges().size());
     }
+
     @Test
     void throwsServiceExceptionOnErrorResponse() {
         UploadResponseHandler responseHandler = new UploadResponseHandler(null);