diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java index 3e67a87949..9322a1d4cc 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java +++ b/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"); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java index d60a1cb54b..629f725fc0 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java +++ b/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 { public static void get(Set projects, AsyncCallback callback) { - RestApi api = new RestApi("access"); + RestApi api = new RestApi("/access/"); for (Project.NameKey p : projects) { api.addParameter("project", p.get()); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountApi.java index 6c6b4b0201..a1bcfe8a58 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountApi.java +++ b/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 accounts().view("self"); + return new RestApi("/accounts/").view("self"); } /** Retrieve the account edit preferences */ @@ -51,7 +51,7 @@ public class AccountApi { public static void suggest(String query, int limit, AsyncCallback> cb) { - accounts() + new RestApi("/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 cb) { - accounts().id(account).view("username").get(cb); + new RestApi("/accounts/").id(account).view("username").get(cb); } /** Set the username */ @@ -73,33 +73,33 @@ public class AccountApi { AsyncCallback cb) { UsernameInput input = UsernameInput.create(); input.username(username); - accounts().id(account).view("username").put(input, cb); + new RestApi("/accounts/").id(account).view("username").put(input, cb); } /** Retrieve email addresses */ public static void getEmails(String account, AsyncCallback> cb) { - accounts().id(account).view("emails").get(cb); + new RestApi("/accounts/").id(account).view("emails").get(cb); } /** Register a new email address */ public static void registerEmail(String account, String email, AsyncCallback cb) { JavaScriptObject in = JavaScriptObject.createObject(); - accounts().id(account).view("emails").id(email) + new RestApi("/accounts/").id(account).view("emails").id(email) .ifNoneMatch().put(in, cb); } /** Retrieve SSH keys */ public static void getSshKeys(String account, AsyncCallback> cb) { - accounts().id(account).view("sshkeys").get(cb); + new RestApi("/accounts/").id(account).view("sshkeys").get(cb); } /** Add a new SSH keys */ public static void addSshKey(String account, String sshPublicKey, AsyncCallback cb) { - accounts().id(account).view("sshkeys") + new RestApi("/accounts/").id(account).view("sshkeys") .post(sshPublicKey, cb); } @@ -114,7 +114,7 @@ public class AccountApi { Set sequenceNumbers, AsyncCallback cb) { CallbackGroup group = new CallbackGroup(); for (int seq : sequenceNumbers) { - accounts().id(account).view("sshkeys").id(seq) + new RestApi("/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 cb) { - accounts().id(account).view("password.http").get(cb); + new RestApi("/accounts/").id(account).view("password.http").get(cb); } /** Generate a new HTTP password */ @@ -132,13 +132,13 @@ public class AccountApi { AsyncCallback cb) { HttpPasswordInput in = HttpPasswordInput.create(); in.generate(true); - accounts().id(account).view("password.http").put(in, cb); + new RestApi("/accounts/").id(account).view("password.http").put(in, cb); } /** Clear HTTP password */ public static void clearHttpPassword(String account, AsyncCallback cb) { - accounts().id(account).view("password.http").delete(cb); + new RestApi("/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> cb) { - accounts() + new RestApi("/accounts/") .id(account) .view("gpgkeys") .post(GpgKeysInput.add(armored), cb); @@ -173,16 +173,12 @@ public class AccountApi { public static void deleteGpgKeys(String account, Iterable fingerprints, AsyncCallback> cb) { - accounts() + new RestApi("/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)); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountCapabilities.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountCapabilities.java index 01122f3e8e..42399ee1bc 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountCapabilities.java +++ b/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 cb, String... filter) { - new RestApi("accounts/self/capabilities") + new RestApi("/accounts/self/capabilities") .addParameter("q", filter) .get(cb); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java index aaadacbcb9..0dfea4fc00 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java +++ b/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() { @Override public void onSuccess(NativeString changeUrl) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/DownloadBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/DownloadBox.java index b6ae18fd3c..c8326cc69d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/DownloadBox.java +++ b/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 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) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeApi.java index 2338a337f4..8314e3efc2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeApi.java +++ b/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) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeList.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeList.java index 784663e6da..cea914277a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeList.java +++ b/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 { - private static final String URI = "changes"; + private static final String URI = "/changes/"; /** Run multiple queries in a single remote invocation. */ public static void queryMultiple( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/ConfigServerApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/ConfigServerApi.java index f88d50d128..28812acb74 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/ConfigServerApi.java +++ b/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> cb) { - new RestApi("config/server/capabilities").get(cb); + new RestApi("/config/server/capabilities/").get(cb); } public static void topMenus(AsyncCallback cb) { - new RestApi("config/server/top-menus").get(cb); + new RestApi("/config/server/top-menus").get(cb); } public static void defaultPreferences(AsyncCallback cb) { - new RestApi("config/server/preferences").get(cb); + new RestApi("/config/server/preferences").get(cb); } public static void serverInfo(AsyncCallback cb) { - new RestApi("config/server/info").get(cb); + new RestApi("/config/server/info").get(cb); } public static void confirmEmail(String token, AsyncCallback 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 { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java index 820176e3a2..1190f9cd18 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java @@ -38,7 +38,7 @@ public class DashboardList extends JsArray { } 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) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocScreen.java index d5a9fbb5e3..0a87d29875 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocScreen.java @@ -22,6 +22,8 @@ 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; @@ -69,7 +71,7 @@ public class DocScreen extends Screen { } private void doQuery() { - RestApi call = new RestApi("Documentation"); + RestApi call = new RestApi(URI); call.addParameterRaw("q", KeyUtil.encode(query)); call.get(loadCallback()); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java index 6738b64922..93be87b893 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java +++ b/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 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 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 { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupList.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupList.java index 9f21888037..a24e1dc245 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupList.java +++ b/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 { public static void my(AsyncCallback callback) { - new RestApi("accounts/self/groups").get(callback); + new RestApi("/accounts/self/groups").get(callback); } public static void included(AccountGroup.UUID group, AsyncCallback callback) { - new RestApi("groups").id(group.get()).view("groups").get(callback); + new RestApi("/groups/").id(group.get()).view("groups").get(callback); } protected GroupList() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupMap.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupMap.java index 2c07ef3a2e..f28fb8649a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupMap.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupMap.java @@ -52,7 +52,7 @@ public class GroupMap extends NativeMap { } private static RestApi groups() { - return new RestApi("groups"); + return new RestApi("/groups/"); } protected GroupMap() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/MemberList.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/MemberList.java index b1c9c7caa4..d63c212f13 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/MemberList.java +++ b/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 { public static void all(AccountGroup.UUID group, AsyncCallback callback) { - new RestApi("groups").id(group.get()).view("members").get(callback); + new RestApi("/groups/").id(group.get()).view("members").get(callback); } protected MemberList() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/ReviewedPanels.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/ReviewedPanels.java index 740a976579..d889c7976a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/ReviewedPanels.java +++ b/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"); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/plugins/PluginMap.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/plugins/PluginMap.java index cc0e158ea7..e4c5159565 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/plugins/PluginMap.java +++ b/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 { public static void all(AsyncCallback callback) { - new RestApi("plugins") + new RestApi("/plugins/") .addParameterTrue("all") .get(NativeMap.copyKeysIntoChildren(callback)); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java index bc0fe6c697..fffdd3f208 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java +++ b/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 { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectMap.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectMap.java index bd94930415..0f121c816c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectMap.java +++ b/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 { public static void all(AsyncCallback callback) { - projects() + new RestApi("/projects/") .addParameterRaw("type", "ALL") .addParameterTrue("all") .addParameterTrue("d") // description @@ -29,7 +29,7 @@ public class ProjectMap extends NativeMap { } public static void permissions(AsyncCallback callback) { - projects() + new RestApi("/projects/") .addParameterRaw("type", "PERMISSIONS") .addParameterTrue("all") .addParameterTrue("d") // description @@ -37,7 +37,7 @@ public class ProjectMap extends NativeMap { } public static void parentCandidates(AsyncCallback callback) { - projects() + new RestApi("/projects/") .addParameterRaw("type", "PARENT_CANDIDATES") .addParameterTrue("all") .addParameterTrue("d") // description @@ -45,7 +45,7 @@ public class ProjectMap extends NativeMap { } public static void suggest(String prefix, int limit, AsyncCallback cb) { - projects() + new RestApi("/projects/") .addParameter("p", prefix) .addParameter("n", limit) .addParameterRaw("type", "ALL") @@ -55,7 +55,7 @@ public class ProjectMap extends NativeMap { } public static void match(String match, int limit, int start, AsyncCallback cb) { - RestApi call = projects(); + RestApi call = new RestApi("/projects/"); if (match != null) { if (match.startsWith("^")) { call.addParameter("r", match); @@ -78,10 +78,6 @@ public class ProjectMap extends NativeMap { match(match, 0, 0, cb); } - private static RestApi projects() { - return new RestApi("projects"); - } - protected ProjectMap() { } }