- fixes #71 batch dependencies need to be in order

Author: baywet

src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java

@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
@@ -20,7 +20,7 @@
 import okio.Buffer;
 
 public class MSBatchRequestContent {
-	private final Map<String, MSBatchRequestStep> batchRequestStepsHashMap;
+	private final LinkedHashMap<String, MSBatchRequestStep> batchRequestStepsHashMap;
 
 	// Maximum number of requests that can be sent in a batch
 	public static final int MAX_NUMBER_OF_REQUESTS = 20;
@@ -34,7 +34,7 @@ public MSBatchRequestContent(final List<MSBatchRequestStep> batchRequestStepsArr
 		if (batchRequestStepsArray.size() > MAX_NUMBER_OF_REQUESTS)
 			throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
 
-		this.batchRequestStepsHashMap = new HashMap<>();
+		this.batchRequestStepsHashMap = new LinkedHashMap<>();
 		for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
 			addBatchRequestStep(requestStep);
 	}
@@ -43,7 +43,7 @@ public MSBatchRequestContent(final List<MSBatchRequestStep> batchRequestStepsArr
 	 * Creates empty batch request content
 	 */
 	public MSBatchRequestContent() {
-		batchRequestStepsHashMap = new HashMap<String, MSBatchRequestStep>();
+		this.batchRequestStepsHashMap = new LinkedHashMap<>();
 	}
 
 	/*

src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java

@@ -1,7 +1,7 @@
 package com.microsoft.graph.content;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -21,7 +21,7 @@
 public class MSBatchResponseContent {
 
 	private final Response batchResponse;
-	private Map<String, Request> batchRequestsHashMap;
+	private LinkedHashMap<String, Request> batchRequestsHashMap;
 	private JsonArray batchResponseArray;
 	private String nextLink;
 
@@ -109,7 +109,7 @@ public Response getResponseById(final String requestId) {
 	public Map<String, Response> getResponses() {
 		if (batchResponseArray == null)
 			return null;
-		final Map<String, Response> responsesMap = new HashMap<>();
+		final Map<String, Response> responsesMap = new LinkedHashMap<>();
 		for (final String id : batchRequestsHashMap.keySet()) {
 			responsesMap.put(id, getResponseById(id));
 		}
@@ -132,7 +132,7 @@ public void update(final Response batchResponse) {
 
 		final Map<String, Request> requestMap = createBatchRequestsHashMap(batchResponse);
 		if (batchRequestsHashMap == null)
-			batchRequestsHashMap = new HashMap<>();
+			batchRequestsHashMap = new LinkedHashMap<>();
 		if (requestMap != null)
 			batchRequestsHashMap.putAll(requestMap);
 
@@ -174,7 +174,7 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
 		if (batchResponse == null)
 			return null;
 		try {
-			final Map<String, Request> batchRequestsHashMap = new HashMap<>();
+			final Map<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
 			final JsonObject requestJSONObject = requestBodyToJSONObject(batchResponse.request());
 			final JsonElement requestArrayElement = requestJSONObject.get("requests");
 			if (requestArrayElement != null && requestArrayElement.isJsonArray()) {