commit a80d685eaa1333e72c94d0b9cb817f37e5ad95d2
author David Pursehouse <dpursehouse@collab.net> Wed Jul 17 11:11:07 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 17 11:11:07 2019 +0000
tree f6094212089df7647eeab6f61f35cc447c72fb8f
parent 8f023a7675181d51f65bdb28f3b526edfb60231e
parent 28c41cc5cf8349e90054b5792b696a3ee2648802

Merge "GetCapabilities: Let RestApiServlet do the conversion to JSON"

java/com/google/gerrit/server/restapi/account/GetCapabilities.java

diff --git a/java/com/google/gerrit/server/restapi/account/GetCapabilities.java b/java/com/google/gerrit/server/restapi/account/GetCapabilities.java
index 77f1668..9e2f1cf 100644
--- a/java/com/google/gerrit/server/restapi/account/GetCapabilities.java
+++ b/java/com/google/gerrit/server/restapi/account/GetCapabilities.java
@@ -30,7 +30,6 @@
 import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.extensions.restapi.RestReadView;
-import com.google.gerrit.json.OutputFormat;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.OptionUtil;
 import com.google.gerrit.server.account.AccountLimits;
@@ -40,7 +39,6 @@
 import com.google.gerrit.server.permissions.GlobalPermission;
 import com.google.gerrit.server.permissions.PermissionBackend;
 import com.google.gerrit.server.permissions.PermissionBackendException;
-import com.google.gson.reflect.TypeToken;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -79,7 +77,7 @@
   }
 
   @Override
-  public Object apply(AccountResource resource)
+  public Map<String, Object> apply(AccountResource resource)
       throws RestApiException, PermissionBackendException {
     permissionBackend.checkUsesDefaultCapabilities();
     PermissionBackend.WithUser perm = permissionBackend.currentUser();
@@ -97,9 +95,7 @@
     addRanges(have, limits);
     addPriority(have, limits);
 
-    return OutputFormat.JSON
-        .newGson()
-        .toJsonTree(have, new TypeToken<Map<String, Object>>() {}.getType());
+    return have;
   }
 
   private Set<GlobalOrPluginPermission> permissionsToTest() {