From 72df8dac87dc797109f6417426e1904d1b3b1b55 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 25 Nov 2020 15:36:26 -0500 Subject: [PATCH] - improves batches replacement by using regex saving compute --- .../com/microsoft/graph/content/MSBatchRequestContent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java index 64eed6c23..d6f756ee8 100644 --- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java +++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java @@ -118,8 +118,7 @@ private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep contentmap.add("id", new JsonPrimitive(batchRequestStep.getRequestId())); final String url = batchRequestStep.getRequest().url().toString() - .replaceAll("https://graph.microsoft.com/v1.0/", "").replaceAll("http://graph.microsoft.com/v1.0/", "") - .replaceAll("https://graph.microsoft.com/beta/", "").replaceAll("http://graph.microsoft.com/beta/", ""); + .replaceAll("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?", ""); // (?i) case insensitive contentmap.add("url", new JsonPrimitive(url)); contentmap.add("method", new JsonPrimitive(batchRequestStep.getRequest().method().toString()));