From 6a56672b72f2bfd5e02a01f2fe3e172001f60ec2 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 23 Jul 2015 13:53:24 +0200 Subject: [PATCH] Use REST call instead of AccountService.changePreferences(...) AccountService.changePreferences(...) is not used anymore and can be removed. Change-Id: Ie67eb430d7409f2ae9b355f1b06792c153c9b353 Signed-off-by: Edwin Kempin --- .../gerrit/common/data/AccountService.java | 6 ----- .../client/download/DownloadUrlLink.java | 16 ++++++++----- .../httpd/rpc/account/AccountServiceImpl.java | 23 ------------------- 3 files changed, 10 insertions(+), 35 deletions(-) diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java index 54a573dacc..81bca202c3 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java @@ -18,7 +18,6 @@ import com.google.gerrit.common.audit.Audit; import com.google.gerrit.common.auth.SignInRequired; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountDiffPreference; -import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountProjectWatch; import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.RemoteJsonService; @@ -34,11 +33,6 @@ public interface AccountService extends RemoteJsonService { @SignInRequired void myAccount(AsyncCallback callback); - @Audit - @SignInRequired - void changePreferences(AccountGeneralPreferences pref, - AsyncCallback gerritCallback); - @Audit @SignInRequired void changeDiffPreferences(AccountDiffPreference diffPref, diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java index 1e6c8e38a8..be0768cc04 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java @@ -15,16 +15,18 @@ package com.google.gerrit.client.download; import com.google.gerrit.client.Gerrit; +import com.google.gerrit.client.account.AccountApi; import com.google.gerrit.client.config.DownloadInfo.DownloadSchemeInfo; +import com.google.gerrit.client.info.AccountPreferencesInfo; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme; import com.google.gwt.aria.client.Roles; +import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Widget; -import com.google.gwtjsonrpc.common.AsyncCallback; -import com.google.gwtjsonrpc.common.VoidResult; import java.util.ArrayList; import java.util.List; @@ -115,14 +117,16 @@ public class DownloadUrlLink extends Anchor implements ClickHandler { // If the user is signed-in, remember this choice for future panels. // pref.setDownloadUrl(scheme); - com.google.gerrit.client.account.Util.ACCOUNT_SVC.changePreferences(pref, - new AsyncCallback() { + AccountPreferencesInfo in = AccountPreferencesInfo.create(); + in.downloadScheme(scheme); + AccountApi.self().view("preferences") + .put(in, new AsyncCallback() { @Override - public void onFailure(Throwable caught) { + public void onSuccess(JavaScriptObject result) { } @Override - public void onSuccess(VoidResult result) { + public void onFailure(Throwable caught) { } }); } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java index a12d8d5770..34066f1b8d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java @@ -22,12 +22,10 @@ import com.google.gerrit.common.errors.NoSuchEntityException; import com.google.gerrit.httpd.rpc.BaseServiceImplementation; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountDiffPreference; -import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountProjectWatch; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.query.QueryParseException; @@ -48,7 +46,6 @@ import java.util.Set; class AccountServiceImpl extends BaseServiceImplementation implements AccountService { private final Provider currentUser; - private final AccountCache accountCache; private final ProjectControl.Factory projectControlFactory; private final AgreementInfoFactory.Factory agreementInfoFactory; private final ChangeQueryBuilder queryBuilder; @@ -56,13 +53,11 @@ class AccountServiceImpl extends BaseServiceImplementation implements @Inject AccountServiceImpl(final Provider schema, final Provider identifiedUser, - final AccountCache accountCache, final ProjectControl.Factory projectControlFactory, final AgreementInfoFactory.Factory agreementInfoFactory, final ChangeQueryBuilder queryBuilder) { super(schema, identifiedUser); this.currentUser = identifiedUser; - this.accountCache = accountCache; this.projectControlFactory = projectControlFactory; this.agreementInfoFactory = agreementInfoFactory; this.queryBuilder = queryBuilder; @@ -78,24 +73,6 @@ class AccountServiceImpl extends BaseServiceImplementation implements }); } - @Override - public void changePreferences(final AccountGeneralPreferences pref, - final AsyncCallback callback) { - run(callback, new Action() { - @Override - public VoidResult run(final ReviewDb db) throws OrmException, Failure { - final Account a = db.accounts().get(getAccountId()); - if (a == null) { - throw new Failure(new NoSuchEntityException()); - } - a.setGeneralPreferences(pref); - db.accounts().update(Collections.singleton(a)); - accountCache.evict(a.getId()); - return VoidResult.INSTANCE; - } - }); - } - @Override public void changeDiffPreferences(final AccountDiffPreference diffPref, AsyncCallback callback) {