Merge pull request #365 from microsoftgraph/bugfix/batches-national-clouds

fixes a bug where batching would fail for national clouds

Author: baywet

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Fixed a bug where batching would fail for national clouds
 - Bumps Azure Core from 1.20.0 to 1.22.0 #359, #360, #341, #342
 - Bumps gson from 2.8.8 to 2.8.9 #356, #355
 - Bumps actions/checkout from 2.3.5 to 2.4.0 #358, #349

gradle/dependencies.gradle

@@ -1,6 +1,7 @@
 dependencies {
     // Use JUnit test framework
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
     testImplementation 'org.mockito:mockito-inline:4.0.0'
 

pom.xml

@@ -43,6 +43,12 @@
             <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.8.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>

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

@@ -168,7 +168,9 @@ public <T> BatchRequestStep<T> getStepById(@Nonnull final String stepId) {
     }
     /** pattern to replace the protocol and host part of the request if specified */
     @Nonnull
-    protected static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
+    protected static final Pattern protocolAndHostReplacementPattern =
+    Pattern.compile("(?i)^http[s]?:\\/\\/(?:graph|dod-graph|microsoftgraph)\\.(?:microsoft|chinacloudapi)\\.(?:com|cn|us|de)\\/(?:v1\\.0|beta)"); // (?i) case insensitive
+    //https://docs.microsoft.com/en-us/graph/deployments#microsoft-graph-and-graph-explorer-service-root-endpoints
     /**
      * Generates a randomly available request id
      * @return a random request id

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

@@ -30,6 +30,8 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -41,7 +43,7 @@
 
 class BatchRequestContentTest {
 
-    String testurl = "http://graph.microsoft.com/me";
+    String testurl = "http://graph.microsoft.com/v1.0/me";
 
     @Test
     void testBatchRequestContentCreation() throws MalformedURLException {
@@ -61,11 +63,21 @@ void testGetBatchRequestContent() throws MalformedURLException {
         BatchRequestContent requestContent = new BatchRequestContent();
         String stepId = requestContent.addBatchRequestStep(requestStep);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
-        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"id\":\""
+        String expectedContent = "{\"requests\":[{\"url\":\"/me\",\"method\":\"GET\",\"id\":\""
                 + stepId + "\"}]}";
         assertEquals(expectedContent, content);
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "https://microsoftgraph.chinacloudapi.cn/v1.0/me", "https://graph.microsoft.com/v1.0/me", "https://graph.microsoft.us/v1.0/me", "https://dod-graph.microsoft.us/v1.0/me", "https://graph.microsoft.de/v1.0/me"})
+    void testItReplacesNationalHost(final String url) throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(url));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        var step = requestContent.requests.get(0);
+        assertEquals("/me", step.url);
+    }
     @Test
     void testGetBatchRequestContentWithHeader() throws MalformedURLException {
         IHttpRequest requestStep = mock(IHttpRequest.class);
@@ -74,7 +86,7 @@ void testGetBatchRequestContentWithHeader() throws MalformedURLException {
         BatchRequestContent requestContent = new BatchRequestContent();
         String stepId = requestContent.addBatchRequestStep(requestStep);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
-        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"id\":\""
+        String expectedContent = "{\"requests\":[{\"url\":\"/me\",\"method\":\"GET\",\"id\":\""
                 + stepId + "\",\"headers\":{\"testkey\":\"testvalue\"}}]}";
         assertEquals(expectedContent, content);
     }
@@ -105,7 +117,7 @@ void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() throws Malforme
 
         requestContent.removeBatchRequestStepWithId(stepId);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
-        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"id\":\""
+        String expectedContent = "{\"requests\":[{\"url\":\"/me\",\"method\":\"GET\",\"id\":\""
                 + step1Id + "\"}]}";
         assertEquals(expectedContent, content);
     }