AccountsUpdate: Rename atomicUpdate to update
After the old update method has been renamed to replace, there is no
need to keep 'atomic' in the method name.
Change-Id: I465d29f567f827868928b178037e26313e2b6cec
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-gpg/src/test/java/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java b/gerrit-gpg/src/test/java/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
index 5f1486b..669b610 100644
--- a/gerrit-gpg/src/test/java/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
+++ b/gerrit-gpg/src/test/java/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
@@ -115,7 +115,7 @@
schemaCreator.create(db);
userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
// Note: does not match any key in TestKeys.
- accountsUpdate.create().atomicUpdate(db, userId, a -> a.setPreferredEmail("user@example.com"));
+ accountsUpdate.create().update(db, userId, a -> a.setPreferredEmail("user@example.com"));
user = reloadUser();
requestContext.setContext(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
index d7e4f9b..a6f1e2b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
@@ -186,7 +186,7 @@
if (!accountUpdates.isEmpty()) {
Account account =
- accountsUpdateFactory.create().atomicUpdate(db, user.getAccountId(), accountUpdates);
+ accountsUpdateFactory.create().update(db, user.getAccountId(), accountUpdates);
if (account == null) {
throw new OrmException("Account " + user.getAccountId() + " has been deleted");
}
@@ -365,7 +365,7 @@
if (who.getEmailAddress() != null) {
accountsUpdateFactory
.create()
- .atomicUpdate(
+ .update(
db,
to,
a -> {
@@ -434,7 +434,7 @@
if (who.getEmailAddress() != null) {
accountsUpdateFactory
.create()
- .atomicUpdate(
+ .update(
db,
from,
a -> {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsUpdate.java
index 03950ed..ef501ea 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsUpdate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsUpdate.java
@@ -229,9 +229,9 @@
* @throws IOException if updating the user branch fails
* @throws ConfigInvalidException if any of the account fields has an invalid value
*/
- public Account atomicUpdate(ReviewDb db, Account.Id accountId, Consumer<Account> consumer)
+ public Account update(ReviewDb db, Account.Id accountId, Consumer<Account> consumer)
throws OrmException, IOException, ConfigInvalidException {
- return atomicUpdate(db, accountId, ImmutableList.of(consumer));
+ return update(db, accountId, ImmutableList.of(consumer));
}
/**
@@ -243,9 +243,11 @@
* @param accountId ID of the account
* @param consumers consumers to update the account, only invoked if the account exists
* @return the updated account, {@code null} if the account doesn't exist
- * @throws OrmException if updating the account fails
+ * @throws OrmException if updating the database fails
+ * @throws IOException if updating the user branch fails
+ * @throws ConfigInvalidException if any of the account fields has an invalid value
*/
- public Account atomicUpdate(ReviewDb db, Account.Id accountId, List<Consumer<Account>> consumers)
+ public Account update(ReviewDb db, Account.Id accountId, List<Consumer<Account>> consumers)
throws OrmException, IOException, ConfigInvalidException {
if (consumers.isEmpty()) {
return null;
@@ -275,7 +277,7 @@
* <p>The existing account with the same account ID is overwritten by the given account. Choosing
* to overwrite an account means that any updates that were done to the account by a racing
* request after the account was read are lost. Updates are also lost if the account was read from
- * a stale account index. This is why using {@link #atomicUpdate(ReviewDb,
+ * a stale account index. This is why using {@link #update(ReviewDb,
* com.google.gerrit.reviewdb.client.Account.Id, Consumer)} to do an atomic update is always
* preferred.
*
@@ -286,7 +288,7 @@
* @throws OrmException if updating the database fails
* @throws IOException if updating the user branch fails
* @throws ConfigInvalidException if any of the account fields has an invalid value
- * @see #atomicUpdate(ReviewDb, com.google.gerrit.reviewdb.client.Account.Id, Consumer)
+ * @see #update(ReviewDb, com.google.gerrit.reviewdb.client.Account.Id, Consumer)
*/
public void replace(ReviewDb db, Account account)
throws OrmException, IOException, ConfigInvalidException {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java
index bb1d6d8..1fa8ed3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java
@@ -63,7 +63,7 @@
Account account =
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
dbProvider.get(),
rsrc.getUser().getAccountId(),
a -> {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java
index f05cd1c..6051a95 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java
@@ -51,7 +51,7 @@
Account account =
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
dbProvider.get(),
rsrc.getUser().getAccountId(),
a -> {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java
index 03697c85..792e71d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java
@@ -88,7 +88,7 @@
Account account =
accountsUpdate
.create()
- .atomicUpdate(dbProvider.get(), user.getAccountId(), a -> a.setFullName(newName));
+ .update(dbProvider.get(), user.getAccountId(), a -> a.setFullName(newName));
if (account == null) {
throw new ResourceNotFoundException("account not found");
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java
index 88c2aec..98d4ac5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java
@@ -71,7 +71,7 @@
Account account =
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
dbProvider.get(),
user.getAccountId(),
a -> {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutStatus.java
index 8339413..136fc68 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutStatus.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutStatus.java
@@ -84,7 +84,7 @@
Account account =
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
dbProvider.get(),
user.getAccountId(),
a -> a.setStatus(Strings.nullToEmpty(newStatus)));
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index dac5331..6b3f173 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -2788,7 +2788,7 @@
Account account =
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
db,
user.getAccountId(),
a -> {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
index c07d336..8323051 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
@@ -498,7 +498,7 @@
}
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
db,
id,
a -> {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index 6f0d5e5..462cf10 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -210,7 +210,7 @@
userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
String email = "user@example.com";
externalIdsUpdate.create().insert(ExternalId.createEmail(userId, email));
- accountsUpdate.create().atomicUpdate(db, userId, a -> a.setPreferredEmail(email));
+ accountsUpdate.create().update(db, userId, a -> a.setPreferredEmail(email));
user = userFactory.create(userId);
requestContext.setContext(newRequestContext(userId));
}
@@ -2340,7 +2340,7 @@
}
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
db,
id,
a -> {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
index 4953eeb..0de5fad 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
@@ -321,7 +321,7 @@
}
accountsUpdate
.create()
- .atomicUpdate(
+ .update(
db,
id,
a -> {
