commit 4bc06cf259d8b00992697dfd469517c25a294a17
author Dave Borowitz <dborowitz@google.com> Wed Apr 17 13:13:46 2019 -0700
committer David Pursehouse <dpursehouse@collab.net> Tue Apr 23 10:44:55 2019 +0900
tree 949ee8ac976dd797b56f4167d8b1603cc76369e9
parent b9e4689dc1b42c31b349fe2dd7539561f38de69b

Adapt to AccountGroup.NameKey refactoring

Change-Id: I022529da581781061fd423db00200c8a3cbaeaa5

src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
index 8f9330d..97b3b44 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
@@ -177,7 +177,7 @@
 
   private AccountGroup.UUID groupUUID(String groupNameOrUUID) {
     Optional<InternalGroup> group =
-        groupByNameFinder.get(new AccountGroup.NameKey(groupNameOrUUID));
+        groupByNameFinder.get(AccountGroup.nameKey(groupNameOrUUID));
     return group.map(InternalGroup::getGroupUUID).orElse(new AccountGroup.UUID(groupNameOrUUID));
   }
 

src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java
index 56bf317..58b4341 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java
@@ -65,7 +65,7 @@
             new FakeConfigFactory(projectName, config),
             new FakeGroupByNameFinder(
                 new AccountGroup(
-                    new AccountGroup.NameKey("testGroupName"),
+                    AccountGroup.nameKey("testGroupName"),
                     new AccountGroup.Id(1),
                     new AccountGroup.UUID("testGroupId"),
                     TimeUtil.nowTs())));