diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java
index 876f85a8b3..b88097c7cc 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java
@@ -105,167 +105,170 @@ public interface AccountApi {
    */
   class NotImplemented implements AccountApi {
     @Override
-    public AccountInfo get() {
+    public AccountInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public boolean getActive() {
+    public boolean getActive() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setActive(boolean active) {
+    public void setActive(boolean active) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String getAvatarUrl(int size) {
+    public String getAvatarUrl(int size) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GeneralPreferencesInfo getPreferences() {
+    public GeneralPreferencesInfo getPreferences() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GeneralPreferencesInfo setPreferences(GeneralPreferencesInfo in) {
+    public GeneralPreferencesInfo setPreferences(GeneralPreferencesInfo in)
+        throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffPreferencesInfo getDiffPreferences() {
+    public DiffPreferencesInfo getDiffPreferences() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffPreferencesInfo setDiffPreferences(DiffPreferencesInfo in) {
+    public DiffPreferencesInfo setDiffPreferences(DiffPreferencesInfo in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public EditPreferencesInfo getEditPreferences() {
+    public EditPreferencesInfo getEditPreferences() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public EditPreferencesInfo setEditPreferences(EditPreferencesInfo in) {
+    public EditPreferencesInfo setEditPreferences(EditPreferencesInfo in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<ProjectWatchInfo> getWatchedProjects() {
+    public List<ProjectWatchInfo> getWatchedProjects() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<ProjectWatchInfo> setWatchedProjects(List<ProjectWatchInfo> in) {
+    public List<ProjectWatchInfo> setWatchedProjects(List<ProjectWatchInfo> in)
+        throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteWatchedProjects(List<ProjectWatchInfo> in) {
+    public void deleteWatchedProjects(List<ProjectWatchInfo> in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void starChange(String changeId) {
+    public void starChange(String changeId) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void unstarChange(String changeId) {
+    public void unstarChange(String changeId) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setStars(String changeId, StarsInput input) {
+    public void setStars(String changeId, StarsInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SortedSet<String> getStars(String changeId) {
+    public SortedSet<String> getStars(String changeId) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<ChangeInfo> getStarredChanges() {
+    public List<ChangeInfo> getStarredChanges() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<EmailInfo> getEmails() {
+    public List<EmailInfo> getEmails() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void addEmail(EmailInput input) {
+    public void addEmail(EmailInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteEmail(String email) {
+    public void deleteEmail(String email) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setStatus(String status) {
+    public void setStatus(String status) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<SshKeyInfo> listSshKeys() {
+    public List<SshKeyInfo> listSshKeys() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SshKeyInfo addSshKey(String key) {
+    public SshKeyInfo addSshKey(String key) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteSshKey(int seq) {
+    public void deleteSshKey(int seq) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, GpgKeyInfo> putGpgKeys(List<String> add, List<String> remove) {
+    public Map<String, GpgKeyInfo> putGpgKeys(List<String> add, List<String> remove)
+        throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GpgKeyApi gpgKey(String id) {
+    public GpgKeyApi gpgKey(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, GpgKeyInfo> listGpgKeys() {
+    public Map<String, GpgKeyInfo> listGpgKeys() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<AgreementInfo> listAgreements() {
+    public List<AgreementInfo> listAgreements() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void signAgreement(String agreementName) {
+    public void signAgreement(String agreementName) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void index() {
+    public void index() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<AccountExternalIdInfo> getExternalIds() {
+    public List<AccountExternalIdInfo> getExternalIds() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteExternalIds(List<String> externalIds) {
+    public void deleteExternalIds(List<String> externalIds) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java
index eab3233b80..e92d22979b 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java
@@ -204,47 +204,47 @@ public interface Accounts {
    */
   class NotImplemented implements Accounts {
     @Override
-    public AccountApi id(String id) {
+    public AccountApi id(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountApi id(int id) {
+    public AccountApi id(int id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountApi self() {
+    public AccountApi self() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountApi create(String username) {
+    public AccountApi create(String username) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountApi create(AccountInput input) {
+    public AccountApi create(AccountInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SuggestAccountsRequest suggestAccounts() {
+    public SuggestAccountsRequest suggestAccounts() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SuggestAccountsRequest suggestAccounts(String query) {
+    public SuggestAccountsRequest suggestAccounts(String query) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public QueryRequest query() {
+    public QueryRequest query() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public QueryRequest query(String query) {
+    public QueryRequest query(String query) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java
index a8a761d8bb..6757a05a4d 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java
@@ -29,12 +29,12 @@ public interface GpgKeyApi {
    */
   class NotImplemented implements GpgKeyApi {
     @Override
-    public GpgKeyInfo get() {
+    public GpgKeyInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void delete() {
+    public void delete() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
index d52cd988fa..aad10a9768 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
@@ -289,253 +289,254 @@ public interface ChangeApi {
     }
 
     @Override
-    public RevisionApi current() {
+    public RevisionApi current() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public RevisionApi revision(int id) {
+    public RevisionApi revision(int id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ReviewerApi reviewer(String id) {
+    public ReviewerApi reviewer(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public RevisionApi revision(String id) {
+    public RevisionApi revision(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void abandon() {
+    public void abandon() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void abandon(AbandonInput in) {
+    public void abandon(AbandonInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void restore() {
+    public void restore() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void restore(RestoreInput in) {
+    public void restore(RestoreInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void move(String destination) {
+    public void move(String destination) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void move(MoveInput in) {
+    public void move(MoveInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setPrivate(boolean value, @Nullable String message) {
+    public void setPrivate(boolean value, @Nullable String message) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setWorkInProgress(String message) {
+    public void setWorkInProgress(String message) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setReadyForReview(String message) {
+    public void setReadyForReview(String message) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi revert() {
+    public ChangeApi revert() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi revert(RevertInput in) {
+    public ChangeApi revert(RevertInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void publish() {
+    public void publish() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void rebase() {
+    public void rebase() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void rebase(RebaseInput in) {
+    public void rebase(RebaseInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void delete() {
+    public void delete() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String topic() {
+    public String topic() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void topic(String topic) {
+    public void topic(String topic) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public IncludedInInfo includedIn() {
+    public IncludedInInfo includedIn() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AddReviewerResult addReviewer(AddReviewerInput in) {
+    public AddReviewerResult addReviewer(AddReviewerInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AddReviewerResult addReviewer(String in) {
+    public AddReviewerResult addReviewer(String in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SuggestedReviewersRequest suggestReviewers() {
+    public SuggestedReviewersRequest suggestReviewers() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SuggestedReviewersRequest suggestReviewers(String query) {
+    public SuggestedReviewersRequest suggestReviewers(String query) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeInfo get(EnumSet<ListChangesOption> options) {
+    public ChangeInfo get(EnumSet<ListChangesOption> options) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeInfo get() {
+    public ChangeInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeInfo info() {
+    public ChangeInfo info() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setMessage(String message) {
+    public void setMessage(String message) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public EditInfo getEdit() {
+    public EditInfo getEdit() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeEditApi edit() {
+    public ChangeEditApi edit() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setHashtags(HashtagsInput input) {
+    public void setHashtags(HashtagsInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Set<String> getHashtags() {
+    public Set<String> getHashtags() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountInfo setAssignee(AssigneeInput input) {
+    public AccountInfo setAssignee(AssigneeInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountInfo getAssignee() {
+    public AccountInfo getAssignee() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<AccountInfo> getPastAssignees() {
+    public List<AccountInfo> getPastAssignees() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccountInfo deleteAssignee() {
+    public AccountInfo deleteAssignee() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, List<CommentInfo>> comments() {
+    public Map<String, List<CommentInfo>> comments() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, List<RobotCommentInfo>> robotComments() {
+    public Map<String, List<RobotCommentInfo>> robotComments() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, List<CommentInfo>> drafts() {
+    public Map<String, List<CommentInfo>> drafts() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeInfo check() {
+    public ChangeInfo check() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeInfo check(FixInput fix) {
+    public ChangeInfo check(FixInput fix) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void index() {
+    public void index() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<ChangeInfo> submittedTogether() {
+    public List<ChangeInfo> submittedTogether() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SubmittedTogetherInfo submittedTogether(EnumSet<SubmittedTogetherOption> options) {
+    public SubmittedTogetherInfo submittedTogether(EnumSet<SubmittedTogetherOption> options)
+        throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
     public SubmittedTogetherInfo submittedTogether(
-        EnumSet<ListChangesOption> a, EnumSet<SubmittedTogetherOption> b) {
+        EnumSet<ListChangesOption> a, EnumSet<SubmittedTogetherOption> b) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeInfo createMergePatchSet(MergePatchSetInput in) {
+    public ChangeInfo createMergePatchSet(MergePatchSetInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void ignore(boolean ignore) {
+    public void ignore(boolean ignore) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void mute(boolean mute) {
+    public void mute(boolean mute) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java
index 0a7c01db19..0708ef5dc9 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java
@@ -147,27 +147,27 @@ public interface Changes {
    */
   class NotImplemented implements Changes {
     @Override
-    public ChangeApi id(int id) {
+    public ChangeApi id(int id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi id(String triplet) {
+    public ChangeApi id(String triplet) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi id(String project, String branch, String id) {
+    public ChangeApi id(String project, String branch, String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi id(String project, int id) {
+    public ChangeApi id(String project, int id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi create(ChangeInput in) {
+    public ChangeApi create(ChangeInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java
index 46827e523b..889175ef19 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java
@@ -38,12 +38,12 @@ public interface CommentApi {
    */
   class NotImplemented implements CommentApi {
     @Override
-    public CommentInfo get() {
+    public CommentInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public CommentInfo delete(DeleteCommentInput input) {
+    public CommentInfo delete(DeleteCommentInput input) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java
index d31e4ae284..fa663a501e 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java
@@ -29,12 +29,12 @@ public interface DraftApi extends CommentApi {
    */
   class NotImplemented extends CommentApi.NotImplemented implements DraftApi {
     @Override
-    public CommentInfo update(DraftInput in) {
+    public CommentInfo update(DraftInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void delete() {
+    public void delete() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java
index a319cbe210..e2bd074ee6 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java
@@ -89,27 +89,27 @@ public interface FileApi {
    */
   class NotImplemented implements FileApi {
     @Override
-    public BinaryResult content() {
+    public BinaryResult content() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffInfo diff() {
+    public DiffInfo diff() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffInfo diff(String base) {
+    public DiffInfo diff(String base) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffInfo diff(int parent) {
+    public DiffInfo diff(int parent) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffRequest diffRequest() {
+    public DiffRequest diffRequest() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java
index 078f828dc0..70e456de7e 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java
@@ -36,27 +36,27 @@ public interface ReviewerApi {
    */
   class NotImplemented implements ReviewerApi {
     @Override
-    public Map<String, Short> votes() {
+    public Map<String, Short> votes() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteVote(String label) {
+    public void deleteVote(String label) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteVote(DeleteVoteInput input) {
+    public void deleteVote(DeleteVoteInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void remove() {
+    public void remove() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void remove(DeleteReviewerInput input) {
+    public void remove(DeleteReviewerInput input) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
index 4672694ab3..7a7444f946 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
@@ -154,87 +154,87 @@ public interface RevisionApi {
    */
   class NotImplemented implements RevisionApi {
     @Override
-    public void delete() {
+    public void delete() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ReviewResult review(ReviewInput in) {
+    public ReviewResult review(ReviewInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void submit() {
+    public void submit() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void submit(SubmitInput in) {
+    public void submit(SubmitInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void publish() {
+    public void publish() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi cherryPick(CherryPickInput in) {
+    public ChangeApi cherryPick(CherryPickInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi rebase() {
+    public ChangeApi rebase() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChangeApi rebase(RebaseInput in) {
+    public ChangeApi rebase(RebaseInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public boolean canRebase() {
+    public boolean canRebase() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public RevisionReviewerApi reviewer(String id) {
+    public RevisionReviewerApi reviewer(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void setReviewed(String path, boolean reviewed) {
+    public void setReviewed(String path, boolean reviewed) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Set<String> reviewed() {
+    public Set<String> reviewed() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public MergeableInfo mergeable() {
+    public MergeableInfo mergeable() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public MergeableInfo mergeableOtherBranches() {
+    public MergeableInfo mergeableOtherBranches() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, FileInfo> files(String base) {
+    public Map<String, FileInfo> files(String base) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, FileInfo> files(int parentNum) {
+    public Map<String, FileInfo> files(int parentNum) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, FileInfo> files() {
+    public Map<String, FileInfo> files() throws RestApiException {
       throw new NotImplementedException();
     }
 
@@ -244,117 +244,117 @@ public interface RevisionApi {
     }
 
     @Override
-    public CommitInfo commit(boolean addLinks) {
+    public CommitInfo commit(boolean addLinks) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, List<CommentInfo>> comments() {
+    public Map<String, List<CommentInfo>> comments() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, List<RobotCommentInfo>> robotComments() {
+    public Map<String, List<RobotCommentInfo>> robotComments() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<CommentInfo> commentsAsList() {
+    public List<CommentInfo> commentsAsList() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<CommentInfo> draftsAsList() {
+    public List<CommentInfo> draftsAsList() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<RobotCommentInfo> robotCommentsAsList() {
+    public List<RobotCommentInfo> robotCommentsAsList() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public EditInfo applyFix(String fixId) {
+    public EditInfo applyFix(String fixId) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, List<CommentInfo>> drafts() {
+    public Map<String, List<CommentInfo>> drafts() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DraftApi createDraft(DraftInput in) {
+    public DraftApi createDraft(DraftInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DraftApi draft(String id) {
+    public DraftApi draft(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public CommentApi comment(String id) {
+    public CommentApi comment(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public RobotCommentApi robotComment(String id) {
+    public RobotCommentApi robotComment(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BinaryResult patch() {
+    public BinaryResult patch() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BinaryResult patch(String path) {
+    public BinaryResult patch(String path) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public Map<String, ActionInfo> actions() {
+    public Map<String, ActionInfo> actions() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SubmitType submitType() {
+    public SubmitType submitType() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BinaryResult submitPreview() {
+    public BinaryResult submitPreview() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BinaryResult submitPreview(String format) {
+    public BinaryResult submitPreview(String format) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public SubmitType testSubmitType(TestSubmitRuleInput in) {
+    public SubmitType testSubmitType(TestSubmitRuleInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public MergeListRequest getMergeList() {
+    public MergeListRequest getMergeList() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void description(String description) {
+    public void description(String description) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String description() {
+    public String description() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String etag() {
+    public String etag() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java
index 681ef4f062..ec2d5d64fd 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java
@@ -31,17 +31,17 @@ public interface RevisionReviewerApi {
    */
   class NotImplemented implements RevisionReviewerApi {
     @Override
-    public Map<String, Short> votes() {
+    public Map<String, Short> votes() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteVote(String label) {
+    public void deleteVote(String label) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteVote(DeleteVoteInput input) {
+    public void deleteVote(DeleteVoteInput input) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java
index 23e65aea46..e44f21fd70 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java
@@ -27,7 +27,7 @@ public interface RobotCommentApi {
    */
   class NotImplemented implements RobotCommentApi {
     @Override
-    public RobotCommentInfo get() {
+    public RobotCommentInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java
index 2280396f45..de59ceef6c 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java
@@ -44,42 +44,44 @@ public interface Server {
    */
   class NotImplemented implements Server {
     @Override
-    public String getVersion() {
+    public String getVersion() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ServerInfo getInfo() {
+    public ServerInfo getInfo() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GeneralPreferencesInfo getDefaultPreferences() {
+    public GeneralPreferencesInfo getDefaultPreferences() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GeneralPreferencesInfo setDefaultPreferences(GeneralPreferencesInfo in) {
+    public GeneralPreferencesInfo setDefaultPreferences(GeneralPreferencesInfo in)
+        throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffPreferencesInfo getDefaultDiffPreferences() {
+    public DiffPreferencesInfo getDefaultDiffPreferences() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public DiffPreferencesInfo setDefaultDiffPreferences(DiffPreferencesInfo in) {
+    public DiffPreferencesInfo setDefaultDiffPreferences(DiffPreferencesInfo in)
+        throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ConsistencyCheckInfo checkConsistency(ConsistencyCheckInput in) {
+    public ConsistencyCheckInfo checkConsistency(ConsistencyCheckInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public AccessCheckInfo checkAccess(AccessCheckInput in) {
+    public AccessCheckInfo checkAccess(AccessCheckInput in) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupApi.java
index 93effe2471..0d4742b647 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupApi.java
@@ -155,57 +155,57 @@ public interface GroupApi {
    */
   class NotImplemented implements GroupApi {
     @Override
-    public GroupInfo get() {
+    public GroupInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GroupInfo detail() {
+    public GroupInfo detail() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String name() {
+    public String name() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void name(String name) {
+    public void name(String name) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GroupInfo owner() {
+    public GroupInfo owner() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void owner(String owner) {
+    public void owner(String owner) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String description() {
+    public String description() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void description(String description) {
+    public void description(String description) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GroupOptionsInfo options() {
+    public GroupOptionsInfo options() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void options(GroupOptionsInfo options) {
+    public void options(GroupOptionsInfo options) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<AccountInfo> members() {
+    public List<AccountInfo> members() throws RestApiException {
       throw new NotImplementedException();
     }
 
@@ -215,27 +215,27 @@ public interface GroupApi {
     }
 
     @Override
-    public void addMembers(String... members) {
+    public void addMembers(String... members) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void removeMembers(String... members) {
+    public void removeMembers(String... members) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<GroupInfo> includedGroups() {
+    public List<GroupInfo> includedGroups() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void addGroups(String... groups) {
+    public void addGroups(String... groups) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void removeGroups(String... groups) {
+    public void removeGroups(String... groups) throws RestApiException {
       throw new NotImplementedException();
     }
 
@@ -245,7 +245,7 @@ public interface GroupApi {
     }
 
     @Override
-    public void index() {
+    public void index() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java
index c874061067..a560fdf06f 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java
@@ -271,17 +271,17 @@ public interface Groups {
    */
   class NotImplemented implements Groups {
     @Override
-    public GroupApi id(String id) {
+    public GroupApi id(String id) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GroupApi create(String name) {
+    public GroupApi create(String name) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public GroupApi create(GroupInput input) {
+    public GroupApi create(GroupInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java
index 42d47cbc75..a1f7327b7c 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java
@@ -37,27 +37,27 @@ public interface BranchApi {
    */
   class NotImplemented implements BranchApi {
     @Override
-    public BranchApi create(BranchInput in) {
+    public BranchApi create(BranchInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BranchInfo get() {
+    public BranchInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void delete() {
+    public void delete() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BinaryResult file(String path) {
+    public BinaryResult file(String path) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public List<ReflogEntryInfo> reflog() {
+    public List<ReflogEntryInfo> reflog() throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java
index 88cca6668b..146ef27c61 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java
@@ -29,12 +29,12 @@ public interface ChildProjectApi {
    */
   class NotImplemented implements ChildProjectApi {
     @Override
-    public ProjectInfo get() {
+    public ProjectInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectInfo get(boolean recursive) {
+    public ProjectInfo get(boolean recursive) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommitApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommitApi.java
index 85bd952ec5..60849628f8 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommitApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommitApi.java
@@ -26,7 +26,7 @@ public interface CommitApi {
   /** A default implementation for source compatibility when adding new methods to the interface. */
   class NotImplemented implements CommitApi {
     @Override
-    public ChangeApi cherryPick(CherryPickInput input) {
+    public ChangeApi cherryPick(CherryPickInput input) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
index 6db13fc233..1401e0652b 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
@@ -138,47 +138,47 @@ public interface ProjectApi {
    */
   class NotImplemented implements ProjectApi {
     @Override
-    public ProjectApi create() {
+    public ProjectApi create() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectApi create(ProjectInput in) {
+    public ProjectApi create(ProjectInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectInfo get() {
+    public ProjectInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public String description() {
+    public String description() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectAccessInfo access() {
+    public ProjectAccessInfo access() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ConfigInfo config() {
+    public ConfigInfo config() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ConfigInfo config(ConfigInput in) {
+    public ConfigInfo config(ConfigInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectAccessInfo access(ProjectAccessInput p) {
+    public ProjectAccessInfo access(ProjectAccessInput p) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void description(DescriptionInput in) {
+    public void description(DescriptionInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
@@ -198,37 +198,37 @@ public interface ProjectApi {
     }
 
     @Override
-    public List<ProjectInfo> children(boolean recursive) {
+    public List<ProjectInfo> children(boolean recursive) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ChildProjectApi child(String name) {
+    public ChildProjectApi child(String name) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public BranchApi branch(String ref) {
+    public BranchApi branch(String ref) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public TagApi tag(String ref) {
+    public TagApi tag(String ref) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteBranches(DeleteBranchesInput in) {
+    public void deleteBranches(DeleteBranchesInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void deleteTags(DeleteTagsInput in) {
+    public void deleteTags(DeleteTagsInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public CommitApi commit(String commit) {
+    public CommitApi commit(String commit) throws RestApiException {
       throw new NotImplementedException();
     }
   }
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java
index bb9ebc98f9..e4a659ce28 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java
@@ -177,17 +177,17 @@ public interface Projects {
    */
   class NotImplemented implements Projects {
     @Override
-    public ProjectApi name(String name) {
+    public ProjectApi name(String name) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectApi create(ProjectInput in) {
+    public ProjectApi create(ProjectInput in) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public ProjectApi create(String name) {
+    public ProjectApi create(String name) throws RestApiException {
       throw new NotImplementedException();
     }
 
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java
index ad30e03904..39efeacbbc 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java
@@ -30,17 +30,17 @@ public interface TagApi {
    */
   class NotImplemented implements TagApi {
     @Override
-    public TagApi create(TagInput input) {
+    public TagApi create(TagInput input) throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public TagInfo get() {
+    public TagInfo get() throws RestApiException {
       throw new NotImplementedException();
     }
 
     @Override
-    public void delete() {
+    public void delete() throws RestApiException {
       throw new NotImplementedException();
     }
   }