commit f2e4cc781b58eb3b5246eaa741cd22545735ffee
author Edwin Kempin <ekempin@google.com> Mon Apr 22 09:33:58 2024 +0000
committer Edwin Kempin <ekempin@google.com> Mon Apr 22 09:33:58 2024 +0000
tree b10f25e546be50e5586ef9bd2236ed49aa04f010
parent a1c41985ded4da847484d42e1f92dbe88a04b9ff

GrantDirectPushPermissionsOnStartup: Fix java code clarity issues

* Merge nested try/catch statements
* Collapse Builder patterns into single expressions.
* Some methods (such as those annotated with @Inject or @Provides) are
  only intended to be called by a framework, and so should have default
  visibility.

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

java/com/google/gerrit/acceptance/GrantDirectPushPermissionsOnStartup.java

diff --git a/java/com/google/gerrit/acceptance/GrantDirectPushPermissionsOnStartup.java b/java/com/google/gerrit/acceptance/GrantDirectPushPermissionsOnStartup.java
index cf54748..fcf4635 100644
--- a/java/com/google/gerrit/acceptance/GrantDirectPushPermissionsOnStartup.java
+++ b/java/com/google/gerrit/acceptance/GrantDirectPushPermissionsOnStartup.java
@@ -50,7 +50,7 @@
   private final Groups groups;
 
   @Inject
-  public GrantDirectPushPermissionsOnStartup(
+  GrantDirectPushPermissionsOnStartup(
       AllProjectsName allProjects,
       MetaDataUpdate.Server metaDataUpdateFactory,
       ProjectConfig.Factory projectConfigFactory,
@@ -63,19 +63,17 @@
 
   @Override
   public void start() {
-    try (RefUpdateContext ctx = openTestRefUpdateContext()) {
-      try (MetaDataUpdate metaDataUpdate = metaDataUpdateFactory.create(allProjects)) {
-        ProjectConfig projectConfig = projectConfigFactory.read(metaDataUpdate);
-        GroupReference adminGroupRef = findAdminGroup().orElseThrow();
-        adminGroupRef = projectConfig.resolve(adminGroupRef);
-        PermissionRule.Builder rule = PermissionRule.builder(adminGroupRef);
-        rule.setAction(Action.ALLOW);
-        projectConfig.upsertAccessSection(
-            RefNames.REFS_HEADS + "*", as -> as.upsertPermission(Permission.PUSH).add(rule));
-        projectConfig.upsertAccessSection(
-            RefNames.REFS_CONFIG, as -> as.upsertPermission(Permission.PUSH).add(rule));
-        projectConfig.commit(metaDataUpdate);
-      }
+    try (RefUpdateContext ctx = openTestRefUpdateContext();
+        MetaDataUpdate metaDataUpdate = metaDataUpdateFactory.create(allProjects)) {
+      ProjectConfig projectConfig = projectConfigFactory.read(metaDataUpdate);
+      GroupReference adminGroupRef = findAdminGroup().orElseThrow();
+      adminGroupRef = projectConfig.resolve(adminGroupRef);
+      PermissionRule.Builder rule = PermissionRule.builder(adminGroupRef).setAction(Action.ALLOW);
+      projectConfig.upsertAccessSection(
+          RefNames.REFS_HEADS + "*", as -> as.upsertPermission(Permission.PUSH).add(rule));
+      projectConfig.upsertAccessSection(
+          RefNames.REFS_CONFIG, as -> as.upsertPermission(Permission.PUSH).add(rule));
+      projectConfig.commit(metaDataUpdate);
     } catch (IOException | ConfigInvalidException e) {
       throw new IllegalStateException(
           "Unable to assign direct push permissions, tests may fail", e);