Merge pull request #640 from microsoftgraph/feature/lean-batches

feature/lean batches

Author: baywet

docs/upgrade-to-v3.md

@@ -174,14 +174,12 @@ The object model for JSON batching has been improved to provide a cleaner API su
     By:
 
     ```Java
-    final MSBatchRequestContent batchRequestContent = new MSBatchRequestContent();
-    final String meGetId = batchRequestContent.addbatchRequestStep(graphClient.me().buildRequest().withHttpMethod(HttpMethod.GET).getHttpRequest());
-    final MSBatchResponseContent batchResponseContent = batchRequestContent.execute(graphClient);
-    final Response userResponse = batchResponseContent.getResponseById(meGetId);
+    final BatchRequestContent batchRequestContent = new BatchRequestContent();
+    final String meGetId = batchRequestContent.addbatchRequestStep(graphClient.me().buildRequest().getHttpRequest());
+    final BatchResponseContent batchResponseContent = graphClient.batch().buildRequest().post(graphClient);
+    final User me = batchResponseContent.getResponseById(meGetId).getDeserializedBody(User.class);
     ```
 
-> Note: this change also replaces the `MSBatchRequestContent` constuctor accepting a list of steps by a vararg constructor and `getArrayOfDependsOnIds` by `getDependsOnIds` (HashSet\<String>).
-
 ### IJsonBackedObject interface
 
 The interface has been simplified to remove the `getRawObject` and `getSerializer` methods. This avoid entity and collection objects storing a copy of the JSON on top of the properties they already have, which improves drastically the memory impacts:

src/test/java/com/microsoft/graph/functional/BatchTests.java

@@ -5,8 +5,8 @@
 
 import java.io.IOException;
 
-import com.microsoft.graph.content.MSBatchRequestContent;
-import com.microsoft.graph.content.MSBatchResponseContent;
+import com.microsoft.graph.content.BatchRequestContent;
+import com.microsoft.graph.content.BatchResponseContent;
 import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.httpcore.HttpClients;
 import com.microsoft.graph.requests.GraphServiceClient;
@@ -17,54 +17,37 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
 @Disabled
 public class BatchTests {
     @Test
     public void GetsABatchFromRequests() throws IOException{
         final TestBase testBase = new TestBase();
-		final GraphServiceClient graphServiceClient = testBase.graphClient;
-        final MSBatchRequestContent batchContent = new MSBatchRequestContent();
+        final GraphServiceClient graphServiceClient = testBase.graphClient;
+        final BatchRequestContent batchContent = new BatchRequestContent();
         final String meGetId = batchContent.addBatchRequestStep(graphServiceClient.me()
-                                        .buildRequest()
-                                        .withHttpMethod(HttpMethod.GET)
-                                        .getHttpRequest());
+                                        .buildRequest());
         assertNotNull(meGetId);
         final String usersGetId = batchContent.addBatchRequestStep(graphServiceClient.users()
                         .buildRequest()
                         .filter("accountEnabled eq true")
                         .expand("manager")
-                        .top(5)
-                        .withHttpMethod(HttpMethod.GET)
-                        .getHttpRequest(),
+                        .top(5),
+                        HttpMethod.GET,
+                        null,
                         meGetId);
         final User userToAdd = new User();
         userToAdd.givenName = "Darrel";
         final String userPostId = batchContent.addBatchRequestStep(graphServiceClient.users()
-                        .buildRequest()
-                        .withHttpMethod(HttpMethod.POST)
-                        .getHttpRequest(userToAdd), usersGetId);
-
-        final String serializedBatchContent = batchContent.getBatchRequestContent();
-
-        final Request batchRequest = new Request.Builder()
-                        .url("https://graph.microsoft.com/v1.0/$batch")
-                        .post(RequestBody.create(serializedBatchContent, MediaType.parse("application/json")))
-                        .build();
-
-        final OkHttpClient client = HttpClients.createDefault(testBase.getAuthenticationProvider());
-        try (final Response batchResponse = client.newCall(batchRequest).execute()) {
-            assertEquals(200, batchResponse.code());
-
-            final MSBatchResponseContent responseContent = new MSBatchResponseContent(batchResponse);
-            assertEquals(400, responseContent.getResponseById(userPostId).code()); //400:we're not providing enough properties for the call to go through
-            assertEquals(200, responseContent.getResponseById(meGetId).code());
-            assertEquals(200, responseContent.getResponseById(usersGetId).code());
-        }
+                        .buildRequest(),
+                        HttpMethod.POST,
+                        userToAdd,
+                        usersGetId);
+
+        final BatchResponseContent responseContent = testBase.graphClient.batch().buildRequest().post(batchContent);
+        assertEquals(400, responseContent.getResponseById(userPostId).status); //400:we're not providing enough properties for the call to go through
+        assertEquals(200, responseContent.getResponseById(meGetId).status);
+        assertEquals(200, responseContent.getResponseById(usersGetId).status);
+        final User me = responseContent.getResponseById(meGetId).getDeserializedBody(User.class);
+        assertNotNull(me.displayName);
     }
 }