Convert remaining uses of MetaDataUpdate to try-with-resource

These were not causing a "should be managed in try-with-resource"
warning from Eclipse, and were found by manual inspection.

Change-Id: I30c09f329c458117ece5878eeaba9c905eee06b2

gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java

@@ -519,21 +519,23 @@ public abstract class AbstractDaemonTest {
 
   protected void setUseContributorAgreements(InheritableBoolean value)
       throws Exception {
-    MetaDataUpdate md = metaDataUpdateFactory.create(project);
+    try (MetaDataUpdate md = metaDataUpdateFactory.create(project)) {
       ProjectConfig config = ProjectConfig.read(md);
       config.getProject().setUseContributorAgreements(value);
       config.commit(md);
       projectCache.evict(config.getProject());
     }
+  }
 
   protected void setUseSignedOffBy(InheritableBoolean value)
       throws Exception {
-    MetaDataUpdate md = metaDataUpdateFactory.create(project);
+    try (MetaDataUpdate md = metaDataUpdateFactory.create(project)) {
       ProjectConfig config = ProjectConfig.read(md);
       config.getProject().setUseSignedOffBy(value);
       config.commit(md);
       projectCache.evict(config.getProject());
     }
+  }
 
   protected void deny(String permission, AccountGroup.UUID id, String ref)
       throws Exception {
@@ -566,7 +568,7 @@ public abstract class AbstractDaemonTest {
   protected void grant(String permission, Project.NameKey project, String ref,
       boolean force) throws RepositoryNotFoundException, IOException,
       ConfigInvalidException {
-    MetaDataUpdate md = metaDataUpdateFactory.create(project);
+    try (MetaDataUpdate md = metaDataUpdateFactory.create(project)) {
       md.setMessage(String.format("Grant %s on %s", permission, ref));
       ProjectConfig config = ProjectConfig.read(md);
       AccessSection s = config.getAccessSection(ref, true);
@@ -578,6 +580,7 @@ public abstract class AbstractDaemonTest {
       config.commit(md);
       projectCache.evict(config.getProject());
     }
+  }
 
   protected void blockRead(String ref) throws Exception {
     block(Permission.READ, REGISTERED_USERS, ref);

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java

@@ -30,12 +30,9 @@ import com.google.gerrit.server.git.MetaDataUpdate;
 import com.google.gerrit.server.git.ProjectConfig;
 import com.google.gerrit.server.group.SystemGroupBackend;
 
-import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class ChangeOwnerIT extends AbstractDaemonTest {
 
   private TestAccount user2;
@@ -80,9 +77,8 @@ public class ChangeOwnerIT extends AbstractDaemonTest {
     approve(a, changeId);
   }
 
-  private void grantApproveToChangeOwner() throws IOException,
+  private void grantApproveToChangeOwner() throws Exception {
-      ConfigInvalidException {
+    try (MetaDataUpdate md = metaDataUpdateFactory.create(project)) {
-    MetaDataUpdate md = metaDataUpdateFactory.create(project);
       md.setMessage(String.format("Grant approve to change owner"));
       ProjectConfig config = ProjectConfig.read(md);
       AccessSection s = config.getAccessSection("refs/heads/*", true);
@@ -95,6 +91,7 @@ public class ChangeOwnerIT extends AbstractDaemonTest {
       config.commit(md);
       projectCache.evict(config.getProject());
     }
+  }
 
   private String createMyChange() throws Exception {
     PushOneCommit push = pushFactory.create(db, user.getIdent(), testRepo);

gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java

@@ -117,13 +117,14 @@ public abstract class AbstractChangeUpdate extends VersionedMetaData {
       throws IOException {
     if (migration.writeChanges()) {
       load();
-      MetaDataUpdate md =
+      try (MetaDataUpdate md =
             updateFactory.create(getProjectName(),
                 repoManager.openMetadataRepository(getProjectName()), getUser(),
-              bru);
+                bru)) {
         md.setAllowEmpty(true);
         return super.openUpdate(md);
       }
+    }
     return new BatchMetaDataUpdate() {
       @Override
       public void write(CommitBuilder commit) {

gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java

@@ -114,10 +114,10 @@ public class AllProjectsCreator {
 
   private void initAllProjects(Repository git)
       throws IOException, ConfigInvalidException {
-    MetaDataUpdate md = new MetaDataUpdate(
+    try (MetaDataUpdate md = new MetaDataUpdate(
           GitReferenceUpdated.DISABLED,
           allProjectsName,
-        git);
+          git)) {
       md.getCommitBuilder().setAuthor(serverUser);
       md.getCommitBuilder().setCommitter(serverUser);
       md.setMessage(MoreObjects.firstNonNull(
@@ -177,6 +177,7 @@ public class AllProjectsCreator {
 
       config.commitToNewRef(md, RefNames.REFS_CONFIG);
     }
+  }
 
   public static LabelType initCodeReviewLabel(ProjectConfig c) {
     LabelType type = new LabelType("Code-Review", ImmutableList.of(

gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java

@@ -75,10 +75,10 @@ public class AllUsersCreator {
 
   private void initAllUsers(Repository git)
       throws IOException, ConfigInvalidException {
-    MetaDataUpdate md = new MetaDataUpdate(
+    try (MetaDataUpdate md = new MetaDataUpdate(
           GitReferenceUpdated.DISABLED,
           allUsersName,
-        git);
+          git)) {
       md.getCommitBuilder().setAuthor(serverUser);
       md.getCommitBuilder().setCommitter(serverUser);
       md.setMessage("Initialized Gerrit Code Review " + Version.getVersion());
@@ -101,3 +101,4 @@ public class AllUsersCreator {
       config.commit(md);
     }
   }
+}

gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java

@@ -196,11 +196,12 @@ public class LabelNormalizerTest {
   }
 
   private void save(ProjectConfig pc) throws Exception {
-    MetaDataUpdate md =
+    try(MetaDataUpdate md =
-        metaDataUpdateFactory.create(pc.getProject().getNameKey(), user);
+        metaDataUpdateFactory.create(pc.getProject().getNameKey(), user)) {
       pc.commit(md);
       projectCache.evict(pc.getProject().getNameKey());
     }
+  }
 
   private PatchSetApproval psa(Account.Id accountId, String label, int value) {
     return new PatchSetApproval(

gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java

@@ -249,10 +249,10 @@ public class ProjectConfigTest extends LocalDiskRepositoryTestCase {
 
   private RevCommit commit(ProjectConfig cfg) throws IOException,
       MissingObjectException, IncorrectObjectTypeException {
-    MetaDataUpdate md = new MetaDataUpdate(
+    try (MetaDataUpdate md = new MetaDataUpdate(
           GitReferenceUpdated.DISABLED,
           cfg.getProject().getNameKey(),
-        db);
+          db)) {
       util.tick(5);
       util.setAuthorAndCommitter(md.getCommitBuilder());
       md.setMessage("Edit\n");
@@ -261,6 +261,7 @@ public class ProjectConfigTest extends LocalDiskRepositoryTestCase {
       Ref ref = db.getRef(RefNames.REFS_CONFIG);
       return util.getRevWalk().parseCommit(ref.getObjectId());
     }
+  }
 
   private void update(RevCommit rev) throws Exception {
     RefUpdate u = db.updateRef(RefNames.REFS_CONFIG);