commit df2b315886b176b33d580e4ba84eb7538719630b
author Hugo Arès <hugo.ares@ericsson.com> Sun Oct 01 10:30:58 2017 +0100
committer Hugo Arès <hugo.ares@ericsson.com> Sun Oct 01 11:27:48 2017 +0100
tree eb1662399f4e21f1d75487d25c1da4cacb83b3d2
parent 512eb25dcd7f21069d921712c24e7cb3436f5de1

Change SetInactiveFlag to accept account id instead of IdentifiedUser

Change-Id: I173903d26b28aa0e55cce76e1e3a29923e82a31c

gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java

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 0ff5342..43669c0 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
@@ -49,6 +49,6 @@
     if (self.get() == rsrc.getUser()) {
       throw new ResourceConflictException("cannot deactivate own account");
     }
-    return setInactiveFlag.deactivate(rsrc.getUser());
+    return setInactiveFlag.deactivate(rsrc.getUser().getAccountId());
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java

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 825ef10..7ce2ea8 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
@@ -41,6 +41,6 @@
   @Override
   public Response<String> apply(AccountResource rsrc, Input input)
       throws ResourceNotFoundException, OrmException, IOException, ConfigInvalidException {
-    return setInactiveFlag.activate(rsrc.getUser());
+    return setInactiveFlag.activate(rsrc.getUser().getAccountId());
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java
index 1698387..6e12c3e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java
@@ -19,7 +19,6 @@
 import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.server.IdentifiedUser;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.io.IOException;
@@ -36,14 +35,14 @@
     this.accountsUpdate = accountsUpdate;
   }
 
-  public Response<?> deactivate(IdentifiedUser user)
+  public Response<?> deactivate(Account.Id accountId)
       throws RestApiException, IOException, ConfigInvalidException {
     AtomicBoolean alreadyInactive = new AtomicBoolean(false);
     Account account =
         accountsUpdate
             .create()
             .update(
-                user.getAccountId(),
+                accountId,
                 a -> {
                   if (!a.isActive()) {
                     alreadyInactive.set(true);
@@ -60,14 +59,14 @@
     return Response.none();
   }
 
-  public Response<String> activate(IdentifiedUser user)
+  public Response<String> activate(Account.Id accountId)
       throws ResourceNotFoundException, IOException, ConfigInvalidException {
     AtomicBoolean alreadyActive = new AtomicBoolean(false);
     Account account =
         accountsUpdate
             .create()
             .update(
-                user.getAccountId(),
+                accountId,
                 a -> {
                   if (a.isActive()) {
                     alreadyActive.set(true);