Skip to content

Commit d025c85

Browse files
committed
- adds support for var ags dependon ids in batches
1 parent 91b3890 commit d025c85

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

‎src/main/java/com/microsoft/graph/content/BatchRequestContent.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package com.microsoft.graph.content;
2424

2525
import java.util.ArrayList;
26+
import java.util.Arrays;
2627
import java.util.HashMap;
2728
import java.util.HashSet;
2829
import java.util.List;
@@ -77,7 +78,7 @@ public String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull
7778
*/
7879
@Nonnull
7980
public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody) {
80-
return addBatchRequestStep(request, httpMethod, serializableBody, null);
81+
return addBatchRequestStep(request, httpMethod, serializableBody, (String[])null);
8182
}
8283
/**
8384
* Adds a request as a step to the current batch
@@ -88,7 +89,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
8889
* @param dependsOnRequestsIds the ids of steps this request depends on
8990
* @return the id of the step that was just added to the batch
9091
*/
91-
public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final HashSet<String> dependsOnRequestsIds) {
92+
public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final String ...dependsOnRequestsIds) {
9293
Objects.requireNonNull(request, "request parameter cannot be null");
9394
Objects.requireNonNull(httpMethod, "httpMethod parameter cannot be null");
9495
if(dependsOnRequestsIds != null)
@@ -105,7 +106,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
105106
url = protocolAndHostReplacementMatcher.replaceAll("");
106107
body = serializableBody;
107108
method = httpMethod;
108-
dependsOn = dependsOnRequestsIds;
109+
dependsOn = dependsOnRequestsIds != null && dependsOnRequestsIds.length > 0 ? new HashSet<String>(Arrays.asList(dependsOnRequestsIds)) : null;
109110
id = getNextRequestId();
110111
}};
111112

‎src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() throws M
100100
IHttpRequest requestStep1 = mock(IHttpRequest.class);
101101
when(requestStep1.getRequestUrl()).thenReturn(new URL(testurl));
102102

103-
String step1Id = requestContent.addBatchRequestStep(requestStep1, HttpMethod.GET, null, new HashSet<String>(Arrays.asList(stepId)));
103+
String step1Id = requestContent.addBatchRequestStep(requestStep1, HttpMethod.GET, null, stepId);
104104

105105
requestContent.removeBatchRequestStepWithId(stepId);
106106
String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
@@ -126,7 +126,7 @@ public void defensiveProgrammingTests() {
126126
}, "remove step by id with null id throws");
127127

128128
assertThrows(IllegalArgumentException.class, () -> {
129-
new BatchRequestContent().addBatchRequestStep(mock(IHttpRequest.class), HttpMethod.GET, null, new HashSet<String>(Arrays.asList("1")));
129+
new BatchRequestContent().addBatchRequestStep(mock(IHttpRequest.class), HttpMethod.GET, null, "1");
130130
}, "dependency on inexisting step throws");
131131
}
132132

@@ -189,7 +189,7 @@ public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException
189189
final BatchRequestContent batchRequest = new BatchRequestContent();
190190
final String stepId = batchRequest.addBatchRequestStep(requestStep);
191191
final String stepId2 = batchRequest.addBatchRequestStep(requestStep);
192-
final String stepId3 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.GET, null, new HashSet<String>(Arrays.asList(stepId, stepId2)));
192+
final String stepId3 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.GET, null, stepId, stepId2);
193193

194194
batchRequest.removeBatchRequestStepWithId(stepId);
195195

0 commit comments

Comments
 (0)