- fixes #364 a bug where batching would fail for national clouds

Author: baywet

CHANGELOG.md

@@ -11,6 +11,8 @@ 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
+
 ## [2.0.9] - 2021-09-17
 
 ### Added

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

@@ -41,7 +41,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 +61,49 @@ 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);
     }
 
+    @Test
+    void testItReplacesChinaHost() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL("https://microsoftgraph.chinacloudapi.cn/v1.0/me"));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        var step = requestContent.requests.get(0);
+        assertEquals("/me", step.url);
+    }
+
+    @Test
+    void testItReplacesGCCHost() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL("https://graph.microsoft.us/v1.0/me"));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        var step = requestContent.requests.get(0);
+        assertEquals("/me", step.url);
+    }
+
+    @Test
+    void testItReplacesDODHost() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL("https://dod-graph.microsoft.us/v1.0/me"));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        var step = requestContent.requests.get(0);
+        assertEquals("/me", step.url);
+    }
+    @Test
+    void testItReplacesGermanHost() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL("https://graph.microsoft.de/v1.0/me"));
+        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 +112,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 +143,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);
     }