refactor: split parseBody into parseJson and parseQuery in test utilities

Author: diegomarquezp

oauth2_http/javatests/com/google/auth/TestUtils.java

@@ -116,24 +116,14 @@ public static Map<String, String> parseQuery(String query) throws IOException {
     return map;
   }
 
-  /**
-   * Parses the request body as either JSON or a query string.
-   *
-   * @param content The request body content.
-   * @return A map of the parsed parameters.
-   * @throws IOException If the content cannot be parsed.
-   */
-  public static Map<String, String> parseBody(String content) throws IOException {
-    if (content != null && content.trim().startsWith("{")) {
-      GenericJson json = JSON_FACTORY.fromString(content, GenericJson.class);
-      Map<String, String> map = new HashMap<>();
-      for (Map.Entry<String, Object> entry : json.entrySet()) {
-        Object value = entry.getValue();
-        map.put(entry.getKey(), value == null ? null : value.toString());
-      }
-      return map;
+  public static Map<String, String> parseJson(String content) throws IOException {
+    GenericJson json = JSON_FACTORY.fromString(content, GenericJson.class);
+    Map<String, String> map = new HashMap<>();
+    for (Map.Entry<String, Object> entry : json.entrySet()) {
+      Object value = entry.getValue();
+      map.put(entry.getKey(), value == null ? null : value.toString());
     }
-    return parseQuery(content);
+    return map;
   }
 
   public static String errorJson(String message) throws IOException {

oauth2_http/javatests/com/google/auth/oauth2/MockTokenServerTransport.java

@@ -213,7 +213,7 @@ public LowLevelHttpResponse execute() throws IOException {
               }
 
               String content = this.getContentAsString();
-              Map<String, String> query = TestUtils.parseBody(content);
+              Map<String, String> query = parseRequestContent(content);
               String accessToken = null;
               String refreshToken = null;
               String grantedScopesString = null;
@@ -332,7 +332,7 @@ public LowLevelHttpResponse execute() throws IOException {
           new MockLowLevelHttpRequest(url) {
             @Override
             public LowLevelHttpResponse execute() throws IOException {
-              Map<String, String> parameters = TestUtils.parseBody(this.getContentAsString());
+              Map<String, String> parameters = parseRequestContent(this.getContentAsString());
               String token = parameters.get("token");
               if (token == null) {
                 throw new IOException("Token to revoke not found.");
@@ -364,7 +364,7 @@ public LowLevelHttpResponse execute() throws IOException {
               }
 
               String content = this.getContentAsString();
-              Map<String, String> query = TestUtils.parseBody(content);
+              Map<String, String> query = parseRequestContent(content);
 
               // Validate required fields.
               if (!query.containsKey("code")
@@ -420,6 +420,12 @@ public LowLevelHttpResponse execute() throws IOException {
     return super.buildRequest(method, url);
   }
 
+  private Map<String, String> parseRequestContent(String content) throws IOException {
+    if (content != null && content.trim().startsWith("{")) {
+      return TestUtils.parseJson(content);
+    }
+    return TestUtils.parseQuery(content);
+  }
   private void validateAdditionalParameters(Map<String, String> query) {
     if (additionalParameters.containsKey(query.get("code"))) {
       Map<String, String> additionalParametersMap = additionalParameters.get(query.get("code"));