commit 066793dc3486a3f7019ec32ab0a0a490c6882d86
author Dave Borowitz <dborowitz@google.com> Wed Apr 17 13:58:16 2019 -0700
committer Dave Borowitz <dborowitz@google.com> Fri Apr 19 12:50:56 2019 -0700
tree 079a8dc1c7453a11d03450b87028799b7ac7fc29
parent 30989e78d4443ac926fc293136562595e7f60b64

Adapt to Account.Id refactoring

Change-Id: I5fc7303cd00422ea9b75a9abf10ec82c7457238f

src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
index ef5379c..d1b044b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
@@ -302,7 +302,7 @@
   public Account.Id getContextUserId() throws ConfigInvalidException {
     int contextUserId = getConfig().getInt("global", "contextUserId", -1);
     if (contextUserId > 0) {
-      return new Account.Id(contextUserId);
+      return Account.id(contextUserId);
     }
     return user.get().getAccountId();
   }

src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
index d07fded..4920df3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
@@ -251,7 +251,7 @@
   @Test
   public void getContextUserIdTest() throws Exception {
     defaultSetup("context_user.config");
-    assertThat(configLoader.getContextUserId()).isEqualTo(new Account.Id(102304));
+    assertThat(configLoader.getContextUserId()).isEqualTo(Account.id(102304));
   }
 
   @Test