Always close BigTable clients

versioned/storage/bigtable-tests/src/main/java/org/projectnessie/versioned/storage/bigtabletests/AbstractBigTableBackendTestFactory.java

@@ -35,13 +35,11 @@ public abstract class AbstractBigTableBackendTestFactory implements BackendTestF
 
   @Override
   public Backend createNewBackend() {
-    return createNewBackend(bigtableConfigBuilder().build(), true);
+    return createNewBackend(bigtableConfigBuilder().build());
   }
 
-  @SuppressWarnings("ClassEscapesDefinedScope")
-  public BigTableBackend createNewBackend(
-      BigTableBackendConfig bigtableConfig, boolean closeClient) {
-    return new BigTableBackend(bigtableConfig, closeClient);
+  public Backend createNewBackend(BigTableBackendConfig bigtableConfig) {
+    return new BigTableBackend(bigtableConfig);
   }
 
   public Builder bigtableConfigBuilder() {

versioned/storage/bigtable/src/intTest/java/org/projectnessie/versioned/storage/bigtable/ITBigTableBackendFactory.java

@@ -46,10 +46,10 @@ public void productionLike() throws Exception {
       BackendFactory<BigTableBackendConfig> factory =
           PersistLoader.findFactoryByName(BigTableBackendFactory.NAME);
       soft.assertThat(factory).isNotNull().isInstanceOf(BigTableBackendFactory.class);
+      RepositoryDescription repoDesc;
 
       try (BigtableDataClient dataClient = testFactory.buildNewDataClient();
           BigtableTableAdminClient tableAdminClient = testFactory.buildNewTableAdminClient()) {
-        RepositoryDescription repoDesc;
         try (Backend backend =
             factory.buildBackend(
                 BigTableBackendConfig.builder()
@@ -68,7 +68,10 @@ public void productionLike() throws Exception {
           repoDesc = repositoryLogic.fetchRepositoryDescription();
           soft.assertThat(repoDesc).isNotNull();
         }
+      }
 
+      try (BigtableDataClient dataClient = testFactory.buildNewDataClient();
+          BigtableTableAdminClient tableAdminClient = testFactory.buildNewTableAdminClient()) {
         try (Backend backend =
             factory.buildBackend(
                 BigTableBackendConfig.builder()

versioned/storage/bigtable/src/intTest/java/org/projectnessie/versioned/storage/bigtable/ITBigTablePersist.java

@@ -49,9 +49,7 @@ public class NoAdminClientBackendRepositoryTests extends AbstractBackendReposito
     @BeforeEach
     void noAdminClient() {
       BigTableBackend b = (BigTableBackend) backend;
-      backend =
-          new BigTableBackend(
-              BigTableBackendConfig.builder().dataClient(b.client()).build(), false);
+      backend = new BigTableBackend(BigTableBackendConfig.builder().dataClient(b.client()).build());
     }
   }
 
@@ -67,13 +65,19 @@ public class TablePrefixes {
     void tablePrefix() {
       AbstractBigTableBackendTestFactory btFactory = (AbstractBigTableBackendTestFactory) factory;
       try (BigTableBackend backendA =
-              btFactory.createNewBackend(
-                  btFactory.bigtableConfigBuilder().tablePrefix(Optional.of("instanceA")).build(),
-                  true);
+              (BigTableBackend)
+                  btFactory.createNewBackend(
+                      btFactory
+                          .bigtableConfigBuilder()
+                          .tablePrefix(Optional.of("instanceA"))
+                          .build());
           BigTableBackend backendB =
-              btFactory.createNewBackend(
-                  btFactory.bigtableConfigBuilder().tablePrefix(Optional.of("instanceB")).build(),
-                  true)) {
+              (BigTableBackend)
+                  btFactory.createNewBackend(
+                      btFactory
+                          .bigtableConfigBuilder()
+                          .tablePrefix(Optional.of("instanceB"))
+                          .build())) {
 
         BigtableTableAdminClient adminClientA = requireNonNull(backendA.adminClient());
         BigtableTableAdminClient adminClientB = requireNonNull(backendB.adminClient());

versioned/storage/bigtable/src/main/java/org/projectnessie/versioned/storage/bigtable/BigTableBackend.java

@@ -59,14 +59,13 @@ public final class BigTableBackend implements Backend {
   private final BigTableBackendConfig config;
   private final BigtableDataClient dataClient;
   private final BigtableTableAdminClient tableAdminClient;
-  private final boolean closeClient;
 
   final String tableRefs;
   final String tableObjs;
   final TableId tableRefsId;
   final TableId tableObjsId;
 
-  public BigTableBackend(@Nonnull BigTableBackendConfig config, boolean closeClient) {
+  public BigTableBackend(@Nonnull BigTableBackendConfig config) {
     this.config = config;
     this.dataClient = config.dataClient();
     this.tableAdminClient = config.tableAdminClient();
@@ -76,7 +75,6 @@ public BigTableBackend(@Nonnull BigTableBackendConfig config, boolean closeClien
         config.tablePrefix().map(prefix -> prefix + '_' + TABLE_OBJS).orElse(TABLE_OBJS);
     this.tableRefsId = TableId.of(tableRefs);
     this.tableObjsId = TableId.of(tableObjs);
-    this.closeClient = closeClient;
   }
 
   @Nonnull
@@ -102,28 +100,26 @@ public PersistFactory createFactory() {
 
   @Override
   public void close() {
-    if (closeClient) {
-      RuntimeException ex = null;
-      try {
-        dataClient.close();
-      } catch (Exception e) {
-        ex = new RuntimeException(e);
-      }
-      try {
-        if (tableAdminClient != null) {
-          tableAdminClient.close();
-        }
-      } catch (Exception e) {
-        if (ex == null) {
-          ex = new RuntimeException(e);
-        } else {
-          ex.addSuppressed(e);
-        }
+    RuntimeException ex = null;
+    try {
+      dataClient.close();
+    } catch (Exception e) {
+      ex = new RuntimeException(e);
+    }
+    try {
+      if (tableAdminClient != null) {
+        tableAdminClient.close();
       }
-      if (ex != null) {
-        throw ex;
+    } catch (Exception e) {
+      if (ex == null) {
+        ex = new RuntimeException(e);
+      } else {
+        ex.addSuppressed(e);
       }
     }
+    if (ex != null) {
+      throw ex;
+    }
   }
 
   @Override

versioned/storage/bigtable/src/main/java/org/projectnessie/versioned/storage/bigtable/BigTableBackendFactory.java

@@ -40,6 +40,6 @@ public BigTableBackendConfig newConfigInstance() {
   @Override
   @Nonnull
   public Backend buildBackend(@Nonnull BigTableBackendConfig config) {
-    return new BigTableBackend(config, false);
+    return new BigTableBackend(config);
   }
 }