Consistently construct RestApi without leading and trailing slashes

Change-Id: I44e1a40351ce5d5e14785ca0876ccbf0b49ca471

gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java

@@ -101,7 +101,7 @@ public class AvatarImage extends Image implements LoadHandler {
         && u.equals(Gerrit.getUserAccount().email())) {
       u = "self";
     }
-    RestApi api = new RestApi("/accounts/").id(u).view("avatar");
+    RestApi api = new RestApi("accounts").id(u).view("avatar");
     if (size > 0) {
       api.addParameter("s", size);
       setSize("", size + "px");

gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java

@@ -26,7 +26,7 @@ import java.util.Set;
 public class AccessMap extends NativeMap<ProjectAccessInfo> {
   public static void get(Set<Project.NameKey> projects,
       AsyncCallback<AccessMap> callback) {
-    RestApi api = new RestApi("/access/");
+    RestApi api = new RestApi("access");
     for (Project.NameKey p : projects) {
       api.addParameter("project", p.get());
     }

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountApi.java

@@ -35,7 +35,7 @@ import java.util.Set;
  */
 public class AccountApi {
   public static RestApi self() {
-    return new RestApi("/accounts/").view("self");
+    return accounts().view("self");
   }
 
   /** Retrieve the account edit preferences */
@@ -51,7 +51,7 @@ public class AccountApi {
 
   public static void suggest(String query, int limit,
       AsyncCallback<JsArray<AccountInfo>> cb) {
-    new RestApi("/accounts/")
+    accounts()
       .addParameter("q", query)
       .addParameter("n", limit)
       .background()
@@ -65,7 +65,7 @@ public class AccountApi {
 
   /** Retrieve the username */
   public static void getUsername(String account, AsyncCallback<NativeString> cb) {
-    new RestApi("/accounts/").id(account).view("username").get(cb);
+    accounts().id(account).view("username").get(cb);
   }
 
   /** Set the username */
@@ -73,33 +73,33 @@ public class AccountApi {
       AsyncCallback<NativeString> cb) {
     UsernameInput input = UsernameInput.create();
     input.username(username);
-    new RestApi("/accounts/").id(account).view("username").put(input, cb);
+    accounts().id(account).view("username").put(input, cb);
   }
 
   /** Retrieve email addresses */
   public static void getEmails(String account,
       AsyncCallback<JsArray<EmailInfo>> cb) {
-    new RestApi("/accounts/").id(account).view("emails").get(cb);
+    accounts().id(account).view("emails").get(cb);
   }
 
   /** Register a new email address */
   public static void registerEmail(String account, String email,
       AsyncCallback<EmailInfo> cb) {
     JavaScriptObject in = JavaScriptObject.createObject();
-    new RestApi("/accounts/").id(account).view("emails").id(email)
+    accounts().id(account).view("emails").id(email)
         .ifNoneMatch().put(in, cb);
   }
 
   /** Retrieve SSH keys */
   public static void getSshKeys(String account,
       AsyncCallback<JsArray<SshKeyInfo>> cb) {
-    new RestApi("/accounts/").id(account).view("sshkeys").get(cb);
+    accounts().id(account).view("sshkeys").get(cb);
   }
 
   /** Add a new SSH keys */
   public static void addSshKey(String account, String sshPublicKey,
       AsyncCallback<SshKeyInfo> cb) {
-    new RestApi("/accounts/").id(account).view("sshkeys")
+    accounts().id(account).view("sshkeys")
         .post(sshPublicKey, cb);
   }
 
@@ -114,7 +114,7 @@ public class AccountApi {
       Set<Integer> sequenceNumbers, AsyncCallback<VoidResult> cb) {
     CallbackGroup group = new CallbackGroup();
     for (int seq : sequenceNumbers) {
-      new RestApi("/accounts/").id(account).view("sshkeys").id(seq)
+      accounts().id(account).view("sshkeys").id(seq)
           .delete(group.add(cb));
       cb = CallbackGroup.emptyCallback();
     }
@@ -124,7 +124,7 @@ public class AccountApi {
   /** Retrieve the HTTP password */
   public static void getHttpPassword(String account,
       AsyncCallback<NativeString> cb) {
-    new RestApi("/accounts/").id(account).view("password.http").get(cb);
+    accounts().id(account).view("password.http").get(cb);
   }
 
   /** Generate a new HTTP password */
@@ -132,13 +132,13 @@ public class AccountApi {
       AsyncCallback<NativeString> cb) {
     HttpPasswordInput in = HttpPasswordInput.create();
     in.generate(true);
-    new RestApi("/accounts/").id(account).view("password.http").put(in, cb);
+    accounts().id(account).view("password.http").put(in, cb);
   }
 
   /** Clear HTTP password */
   public static void clearHttpPassword(String account,
       AsyncCallback<VoidResult> cb) {
-    new RestApi("/accounts/").id(account).view("password.http").delete(cb);
+    accounts().id(account).view("password.http").delete(cb);
   }
 
   private static class HttpPasswordInput extends JavaScriptObject {
@@ -165,7 +165,7 @@ public class AccountApi {
 
   public static void addGpgKey(String account, String armored,
       AsyncCallback<NativeMap<GpgKeyInfo>> cb) {
-    new RestApi("/accounts/")
+    accounts()
       .id(account)
       .view("gpgkeys")
       .post(GpgKeysInput.add(armored), cb);
@@ -173,12 +173,16 @@ public class AccountApi {
 
   public static void deleteGpgKeys(String account,
       Iterable<String> fingerprints, AsyncCallback<NativeMap<GpgKeyInfo>> cb) {
-    new RestApi("/accounts/")
+    accounts()
       .id(account)
       .view("gpgkeys")
       .post(GpgKeysInput.delete(fingerprints), cb);
   }
 
+  private static RestApi accounts() {
+    return new RestApi("accounts");
+  }
+
   private static class GpgKeysInput extends JavaScriptObject {
     static GpgKeysInput add(String key) {
       return createWithAdd(Natives.arrayOf(key));

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountCapabilities.java

@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 /** Capabilities the caller has from {@code /accounts/self/capabilities}.  */
 public class AccountCapabilities extends JavaScriptObject {
   public static void all(AsyncCallback<AccountCapabilities> cb, String... filter) {
-    new RestApi("/accounts/self/capabilities")
+    new RestApi("accounts/self/capabilities")
       .addParameter("q", filter)
       .get(cb);
   }

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java

@@ -100,7 +100,7 @@ public class MyProfileScreen extends SettingsScreen {
   void display(AccountInfo account) {
     if (Gerrit.info().plugin().hasAvatars()) {
       avatar.setAccount(account, 93, false);
-      new RestApi("/accounts/").id("self").view("avatar.change.url")
+      new RestApi("accounts").id("self").view("avatar.change.url")
           .get(new AsyncCallback<NativeString>() {
             @Override
             public void onSuccess(NativeString changeUrl) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/DownloadBox.java

@@ -135,7 +135,7 @@ class DownloadBox extends VerticalPanel {
   private void insertPatch() {
     String id = revision.substring(0, 7);
     Anchor patchBase64 = new Anchor(id + ".diff.base64");
-    patchBase64.setHref(new RestApi("/changes/")
+    patchBase64.setHref(new RestApi("changes")
       .id(psId.getParentKey().get())
       .view("revisions")
       .id(revision)
@@ -144,7 +144,7 @@ class DownloadBox extends VerticalPanel {
       .url());
 
     Anchor patchZip = new Anchor(id + ".diff.zip");
-    patchZip.setHref(new RestApi("/changes/")
+    patchZip.setHref(new RestApi("changes")
       .id(psId.getParentKey().get())
       .view("revisions")
       .id(revision)
@@ -170,7 +170,7 @@ class DownloadBox extends VerticalPanel {
     List<Anchor> anchors = new ArrayList<>(activated.size());
     for (String f : activated) {
       Anchor archive = new Anchor(f);
-      archive.setHref(new RestApi("/changes/")
+      archive.setHref(new RestApi("changes")
           .id(psId.getParentKey().get())
           .view("revisions")
           .id(revision)

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeApi.java

@@ -59,7 +59,7 @@ public class ChangeApi {
       input.status(Change.Status.DRAFT.toString());
     }
 
-    new RestApi("/changes/").post(input, cb);
+    new RestApi("changes").post(input, cb);
   }
 
   /** Restore a previously abandoned change to be open again. */
@@ -308,7 +308,7 @@ public class ChangeApi {
 
   public static RestApi change(int id) {
     // TODO Switch to triplet project~branch~id format in URI.
-    return new RestApi("/changes/").id(String.valueOf(id));
+    return new RestApi("changes").id(String.valueOf(id));
   }
 
   public static String emptyToNull(String str) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeList.java

@@ -25,7 +25,7 @@ import java.util.Set;
 
 /** List of changes available from {@code /changes/}. */
 public class ChangeList extends JsArray<ChangeInfo> {
-  private static final String URI = "/changes/";
+  private static final String URI = "changes";
 
   /** Run multiple queries in a single remote invocation. */
   public static void queryMultiple(

gerrit-gwtui/src/main/java/com/google/gerrit/client/config/ConfigServerApi.java

@@ -30,25 +30,25 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 public class ConfigServerApi {
   /** map of the server wide capabilities (core & plugins). */
   public static void capabilities(AsyncCallback<NativeMap<CapabilityInfo>> cb) {
-    new RestApi("/config/server/capabilities/").get(cb);
+    new RestApi("config/server/capabilities").get(cb);
   }
 
   public static void topMenus(AsyncCallback<TopMenuList> cb) {
-    new RestApi("/config/server/top-menus").get(cb);
+    new RestApi("config/server/top-menus").get(cb);
   }
 
   public static void defaultPreferences(AsyncCallback<AccountPreferencesInfo> cb) {
-    new RestApi("/config/server/preferences").get(cb);
+    new RestApi("config/server/preferences").get(cb);
   }
 
   public static void serverInfo(AsyncCallback<ServerInfo> cb) {
-    new RestApi("/config/server/info").get(cb);
+    new RestApi("config/server/info").get(cb);
   }
 
   public static void confirmEmail(String token, AsyncCallback<VoidResult> cb) {
     EmailConfirmationInput input = EmailConfirmationInput.create();
     input.setToken(token);
-    new RestApi("/config/server/email.confirm").put(input, cb);
+    new RestApi("config/server/email.confirm").put(input, cb);
   }
 
   private static class EmailConfirmationInput extends JavaScriptObject {

gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java

@@ -38,7 +38,7 @@ public class DashboardList extends JsArray<DashboardInfo> {
   }
 
   private static RestApi base(Project.NameKey project) {
-    return new RestApi("/projects/").id(project.get()).view("dashboards");
+    return new RestApi("projects").id(project.get()).view("dashboards");
   }
 
   private static String encodeDashboardId(String id) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocScreen.java

@@ -22,8 +22,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwtorm.client.KeyUtil;
 
 public class DocScreen extends Screen {
-  private static final String URI = "/Documentation/";
-
   private DocTable table;
   private final String query;
 
@@ -71,7 +69,7 @@ public class DocScreen extends Screen {
   }
 
   private void doQuery() {
-    RestApi call = new RestApi(URI);
+    RestApi call = new RestApi("Documentation");
     call.addParameterRaw("q", KeyUtil.encode(query));
     call.get(loadCallback());
   }

gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java

@@ -34,7 +34,7 @@ public class GroupApi {
   /** Create a new group */
   public static void createGroup(String groupName, AsyncCallback<GroupInfo> cb) {
     JavaScriptObject in = JavaScriptObject.createObject();
-    new RestApi("/groups/").id(groupName).ifNoneMatch().put(in, cb);
+    new RestApi("groups").id(groupName).ifNoneMatch().put(in, cb);
   }
 
   public static void getGroupDetail(String group, AsyncCallback<GroupInfo> cb) {
@@ -212,7 +212,7 @@ public class GroupApi {
   }
 
   private static RestApi group(String group) {
-    return new RestApi("/groups/").id(group);
+    return new RestApi("groups").id(group);
   }
 
   private static class GroupInput extends JavaScriptObject {

gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupList.java

@@ -22,12 +22,12 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 /** Groups available from {@code /groups/} or {@code /accounts/[id]/groups}. */
 public class GroupList extends JsArray<GroupInfo> {
   public static void my(AsyncCallback<GroupList> callback) {
-    new RestApi("/accounts/self/groups").get(callback);
+    new RestApi("accounts/self/groups").get(callback);
   }
 
   public static void included(AccountGroup.UUID group,
       AsyncCallback<GroupList> callback) {
-    new RestApi("/groups/").id(group.get()).view("groups").get(callback);
+    new RestApi("groups").id(group.get()).view("groups").get(callback);
   }
 
   protected GroupList() {

gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupMap.java

@@ -52,7 +52,7 @@ public class GroupMap extends NativeMap<GroupInfo> {
   }
 
   private static RestApi groups() {
-    return new RestApi("/groups/");
+    return new RestApi("groups");
   }
 
   protected GroupMap() {

gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/MemberList.java

@@ -23,7 +23,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 public class MemberList extends JsArray<AccountInfo> {
   public static void all(AccountGroup.UUID group,
       AsyncCallback<MemberList> callback) {
-    new RestApi("/groups/").id(group.get()).view("members").get(callback);
+    new RestApi("groups").id(group.get()).view("members").get(callback);
   }
 
   protected MemberList() {

gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/ReviewedPanels.java

@@ -100,7 +100,7 @@ class ReviewedPanels {
         fileList.updateReviewedStatus(patchKey, reviewed);
       }
 
-      RestApi api = new RestApi("/changes/").id(ps.getParentKey().get())
+      RestApi api = new RestApi("changes").id(ps.getParentKey().get())
           .view("revisions").id(ps.get())
           .view("files").id(patchKey.getFileName())
           .view("reviewed");

gerrit-gwtui/src/main/java/com/google/gerrit/client/plugins/PluginMap.java

@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 /** Plugins available from {@code /plugins/}. */
 public class PluginMap extends NativeMap<PluginInfo> {
   public static void all(AsyncCallback<PluginMap> callback) {
-    new RestApi("/plugins/")
+    new RestApi("plugins")
       .addParameterTrue("all")
       .get(NativeMap.copyKeysIntoChildren(callback));
   }

gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java

@@ -40,7 +40,7 @@ public class ProjectApi {
     input.setParent(parent);
     input.setPermissionsOnly(permissionsOnly);
     input.setCreateEmptyCommit(createEmptyCcommit);
-    new RestApi("/projects/").id(projectName).ifNoneMatch()
+    new RestApi("projects").id(projectName).ifNoneMatch()
         .put(input, cb);
   }
 
@@ -194,7 +194,7 @@ public class ProjectApi {
   }
 
   public static RestApi project(Project.NameKey name) {
-    return new RestApi("/projects/").id(name.get());
+    return new RestApi("projects").id(name.get());
   }
 
   private static class ProjectInput extends JavaScriptObject {

gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectMap.java

@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 /** Projects available from {@code /projects/}. */
 public class ProjectMap extends NativeMap<ProjectInfo> {
   public static void all(AsyncCallback<ProjectMap> callback) {
-    new RestApi("/projects/")
+    projects()
         .addParameterRaw("type", "ALL")
         .addParameterTrue("all")
         .addParameterTrue("d") // description
@@ -29,7 +29,7 @@ public class ProjectMap extends NativeMap<ProjectInfo> {
   }
 
   public static void permissions(AsyncCallback<ProjectMap> callback) {
-    new RestApi("/projects/")
+    projects()
         .addParameterRaw("type", "PERMISSIONS")
         .addParameterTrue("all")
         .addParameterTrue("d") // description
@@ -37,7 +37,7 @@ public class ProjectMap extends NativeMap<ProjectInfo> {
   }
 
   public static void parentCandidates(AsyncCallback<ProjectMap> callback) {
-    new RestApi("/projects/")
+    projects()
         .addParameterRaw("type", "PARENT_CANDIDATES")
         .addParameterTrue("all")
         .addParameterTrue("d") // description
@@ -45,7 +45,7 @@ public class ProjectMap extends NativeMap<ProjectInfo> {
   }
 
   public static void suggest(String prefix, int limit, AsyncCallback<ProjectMap> cb) {
-    new RestApi("/projects/")
+    projects()
         .addParameter("p", prefix)
         .addParameter("n", limit)
         .addParameterRaw("type", "ALL")
@@ -55,7 +55,7 @@ public class ProjectMap extends NativeMap<ProjectInfo> {
   }
 
   public static void match(String match, int limit, int start, AsyncCallback<ProjectMap> cb) {
-    RestApi call = new RestApi("/projects/");
+    RestApi call = projects();
     if (match != null) {
       if (match.startsWith("^")) {
         call.addParameter("r", match);
@@ -78,6 +78,10 @@ public class ProjectMap extends NativeMap<ProjectInfo> {
     match(match, 0, 0, cb);
   }
 
+  private static RestApi projects() {
+    return new RestApi("projects");
+  }
+
   protected ProjectMap() {
   }
 }