commit 52ae46168ddb8eb9c2552a23853b55503c26bcb9
author Edwin Kempin <ekempin@google.com> Thu Apr 18 08:36:12 2024 +0000
committer Edwin Kempin <ekempin@google.com> Thu Apr 18 08:37:28 2024 +0000
tree 0f6bfec7abef79aa8ee532fee4505535268c3bec
parent 9ac0670755b4d58f3acdf2e255102189f969022b

More renaming of batch users to service users

The group for batch users is called "Service Users" nowadays. Make
variable names consistent with this.

Release-Notes: skip
Change-Id: I73463ccca5c1ac38abf17c694876cbabc392697f
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/schema/AllProjectsInput.java

diff --git a/java/com/google/gerrit/server/schema/AllProjectsInput.java b/java/com/google/gerrit/server/schema/AllProjectsInput.java
index 8db5b1a..c79a1e6 100644
--- a/java/com/google/gerrit/server/schema/AllProjectsInput.java
+++ b/java/com/google/gerrit/server/schema/AllProjectsInput.java
@@ -110,7 +110,7 @@
   public abstract static class Builder {
     public abstract Builder administratorsGroup(GroupReference adminGroup);
 
-    public abstract Builder serviceUsersGroup(GroupReference serviceGroup);
+    public abstract Builder serviceUsersGroup(GroupReference serviceUsersGroup);
 
     public abstract Builder commitMessage(String commitMessage);
 

javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java

diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
index 6c5febd..b6d4577 100644
--- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
@@ -87,7 +87,7 @@
   @Inject private IndexOperations.Change changeIndexOperations;
 
   private AccountGroup.UUID admins;
-  private AccountGroup.UUID nonInteractiveUsers;
+  private AccountGroup.UUID serviceUsers;
 
   private RevCommit rcMaster;
   private RevCommit rcBranch;
@@ -118,7 +118,7 @@
   @Before
   public void setUp() throws Exception {
     admins = adminGroupUuid();
-    nonInteractiveUsers = groupUuid(ServiceUserClassifier.SERVICE_USERS);
+    serviceUsers = groupUuid(ServiceUserClassifier.SERVICE_USERS);
     setUpPermissions();
     setUpChanges();
   }
@@ -1239,7 +1239,7 @@
       assertThat(getGroupRefs(git))
           .containsExactly(
               RefNames.refsGroups(admins),
-              RefNames.refsGroups(nonInteractiveUsers),
+              RefNames.refsGroups(serviceUsers),
               RefNames.refsGroups(users));
     }
   }
@@ -1261,7 +1261,7 @@
       assertThat(getGroupRefs(git))
           .containsExactly(
               RefNames.refsGroups(admins),
-              RefNames.refsGroups(nonInteractiveUsers),
+              RefNames.refsGroups(serviceUsers),
               RefNames.refsGroups(users));
     }
   }
@@ -1413,7 +1413,7 @@
             RefNames.REFS_EXTERNAL_IDS,
             RefNames.REFS_GROUPNAMES,
             RefNames.refsGroups(admins),
-            RefNames.refsGroups(nonInteractiveUsers),
+            RefNames.refsGroups(serviceUsers),
             RefNames.REFS_SEQUENCES + Sequence.NAME_ACCOUNTS,
             RefNames.REFS_SEQUENCES + Sequence.NAME_GROUPS,
             RefNames.REFS_CONFIG,

javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java

diff --git a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java
index 6c79c43..17a39d6 100644
--- a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java
+++ b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java
@@ -89,11 +89,11 @@
     expectedConfig.fromText(getDefaultAllProjectsWithAllDefaultSections());
 
     GroupReference adminsGroup = createGroupReference("Administrators");
-    GroupReference batchUsersGroup = createGroupReference(ServiceUserClassifier.SERVICE_USERS);
+    GroupReference serviceUsersGroup = createGroupReference(ServiceUserClassifier.SERVICE_USERS);
     AllProjectsInput allProjectsInput =
         AllProjectsInput.builder()
             .administratorsGroup(adminsGroup)
-            .serviceUsersGroup(batchUsersGroup)
+            .serviceUsersGroup(serviceUsersGroup)
             .build();
     allProjectsCreator.create(allProjectsInput);