opendev/gerrit
Code Issues Proposed changes

Merge "SetPreferences/GetPreferences: Remove unused exception declarations"

Browse Source
This commit is contained in:
David Ostrovsky
2016-03-20 11:00:13 +00:00
committed by Gerrit Code Review
parent d325e5ffa0 499246e683
commit 7e377e0f30
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java
View File

@@ -16,19 +16,13 @@ package com.google.gerrit.server.account;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.CurrentUser;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.eclipse.jgit.errors.ConfigInvalidException;
import java.io.IOException;
@Singleton
public class GetPreferences implements RestReadView<AccountResource> {
private final Provider<CurrentUser> self;
@@ -43,8 +37,7 @@ public class GetPreferences implements RestReadView<AccountResource> {
@Override
public GeneralPreferencesInfo apply(AccountResource rsrc)
throws AuthException, ResourceNotFoundException, OrmException,
IOException, ConfigInvalidException {
throws AuthException {
if (self.get() != rsrc.getUser()
&& !self.get().getCapabilities().canModifyAccount()) {
throw new AuthException("requires Modify Account capability");

6
gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java
View File

@@ -29,14 +29,12 @@ import com.google.gerrit.extensions.config.DownloadScheme;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.UserConfigSections;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -78,8 +76,8 @@ public class SetPreferences implements
@Override
public GeneralPreferencesInfo apply(AccountResource rsrc,
GeneralPreferencesInfo i)
throws AuthException, ResourceNotFoundException, BadRequestException,
OrmException, IOException, ConfigInvalidException {
throws AuthException, BadRequestException, IOException,
ConfigInvalidException {
if (self.get() != rsrc.getUser()
&& !self.get().getCapabilities().canModifyAccount()) {
throw new AuthException("requires Modify Account capability");