Delete the interface in FileIOFactory that is only used for testing

Author: XJDKC

quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java

@@ -38,8 +38,8 @@
 import org.apache.polaris.core.admin.model.FileStorageConfigInfo;
 import org.apache.polaris.core.admin.model.PolarisCatalog;
 import org.apache.polaris.core.admin.model.StorageConfigInfo;
-import org.apache.polaris.service.catalog.io.TestFileIOFactory;
 import org.apache.polaris.service.TestServices;
+import org.apache.polaris.service.catalog.io.TestFileIOFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;

service/common/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java

@@ -40,9 +40,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.iceberg.BaseMetastoreTableOperations;
 import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.CatalogUtil;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.TableMetadata;
@@ -325,7 +327,7 @@ public Table registerTable(TableIdentifier identifier, String metadataFileLocati
           String.format("Failed to fetch resolved parent for TableIdentifier '%s'", identifier));
     }
     FileIO fileIO =
-        refreshIOForTableLike(
+        loadFileIOForTableLike(
             identifier,
             Set.of(locationDir),
             resolvedParent,
@@ -1194,7 +1196,7 @@ public void doRefresh() {
               // then we should use the actual current table properties for IO refresh here
               // instead of the general tableDefaultProperties.
               FileIO fileIO =
-                  refreshIOForTableLike(
+                  loadFileIOForTableLike(
                       tableIdentifier,
                       Set.of(latestLocationDir),
                       resolvedEntities,
@@ -1230,7 +1232,7 @@ public void doCommit(TableMetadata base, TableMetadata metadata) {
 
       // refresh credentials because we need to read the metadata file to validate its location
       tableFileIO =
-          refreshIOForTableLike(
+          loadFileIOForTableLike(
               tableIdentifier,
               getLocationsAllowedToBeAccessed(metadata),
               resolvedStorageEntity,
@@ -1414,7 +1416,7 @@ public void doRefresh() {
               // then we should use the actual current table properties for IO refresh here
               // instead of the general tableDefaultProperties.
               FileIO fileIO =
-                  refreshIOForTableLike(
+                  loadFileIOForTableLike(
                       identifier,
                       Set.of(latestLocationDir),
                       resolvedEntities,
@@ -1468,7 +1470,7 @@ public void doCommit(ViewMetadata base, ViewMetadata metadata) {
       Map<String, String> tableProperties = new HashMap<>(metadata.properties());
 
       viewFileIO =
-          refreshIOForTableLike(
+          loadFileIOForTableLike(
               identifier,
               getLocationsAllowedToBeAccessed(metadata),
               resolvedStorageEntity,
@@ -1525,7 +1527,7 @@ protected String viewName() {
     }
   }
 
-  private FileIO refreshIOForTableLike(
+  private FileIO loadFileIOForTableLike(
       TableIdentifier identifier,
       Set<String> readLocations,
       PolarisResolvedPathWrapper resolvedStorageEntity,
@@ -1839,7 +1841,7 @@ private boolean sendNotificationForTableLike(
 
       // Validate that we can construct a FileIO
       String locationDir = metadataLocation.substring(0, metadataLocation.lastIndexOf("/"));
-      refreshIOForTableLike(
+      loadFileIOForTableLike(
           tableIdentifier,
           Set.of(locationDir),
           resolvedStorageEntity,
@@ -1894,7 +1896,7 @@ private boolean sendNotificationForTableLike(
       String locationDir = newLocation.substring(0, newLocation.lastIndexOf("/"));
 
       FileIO fileIO =
-          refreshIOForTableLike(
+          loadFileIOForTableLike(
               tableIdentifier,
               Set.of(locationDir),
               resolvedParent,
@@ -1973,8 +1975,7 @@ private List<TableIdentifier> listTableLike(PolarisEntitySubType subType, Namesp
    * @return FileIO object
    */
   private FileIO loadFileIO(String ioImpl, Map<String, String> properties) {
-    Map<String, String> propertiesWithS3CustomizedClientFactory = new HashMap<>(properties);
-    return fileIOFactory.loadFileIO(realmId, ioImpl, propertiesWithS3CustomizedClientFactory);
+    return CatalogUtil.loadFileIO(ioImpl, properties, new Configuration());
   }
 
   private void blockedUserSpecifiedWriteLocation(Map<String, String> properties) {

service/common/src/main/java/org/apache/polaris/service/catalog/io/DefaultFileIOFactory.java

@@ -68,14 +68,6 @@ public DefaultFileIOFactory(
     this.configurationStore = configurationStore;
   }
 
-  @Override
-  public FileIO loadFileIO(
-      @Nonnull RealmId realmId,
-      @Nonnull String ioImplClassName,
-      @Nonnull Map<String, String> properties) {
-    return loadFileIOInternal(ioImplClassName, properties);
-  }
-
   @Override
   public FileIO loadFileIO(
       @Nonnull RealmId realmId,

service/common/src/main/java/org/apache/polaris/service/catalog/io/FileIOFactory.java

@@ -35,12 +35,6 @@
  */
 public interface FileIOFactory {
 
-  /** This method is intended for use in tests only. */
-  FileIO loadFileIO(
-      @Nonnull RealmId realmId,
-      @Nonnull String ioImplClassName,
-      @Nonnull Map<String, String> properties);
-
   /**
    * Loads a FileIO implementation for a specific table in the given realm with detailed config.
    *

service/common/src/main/java/org/apache/polaris/service/catalog/io/WasbTranslatingFileIOFactory.java

@@ -50,15 +50,6 @@ public WasbTranslatingFileIOFactory(
             realmEntityManagerFactory, metaStoreManagerFactory, configurationStore);
   }
 
-  @Override
-  public FileIO loadFileIO(
-      @Nonnull RealmId realmId,
-      @Nonnull String ioImplClassName,
-      @Nonnull Map<String, String> properties) {
-    return new WasbTranslatingFileIO(
-        defaultFileIOFactory.loadFileIO(realmId, ioImplClassName, properties));
-  }
-
   @Override
   public FileIO loadFileIO(
       @Nonnull RealmId realmId,

service/common/src/test/java/org/apache/polaris/service/catalog/io/FileIOFactoryTest.java

@@ -120,23 +120,6 @@ public void after() {
     metaStoreManager.purge(metaStoreSession);
   }
 
-  @Test
-  public void testLoadFileIOForCatalog() {
-    String testProperty = "test.property";
-    FileIOFactory fileIOFactory =
-        new DefaultFileIOFactory(
-            realmEntityManagerFactory, metaStoreManagerFactory, configurationStore) {
-          @Override
-          FileIO loadFileIOInternal(
-              @Nonnull String ioImplClassName, @Nonnull Map<String, String> properties) {
-            org.assertj.core.api.Assertions.assertThat(properties)
-                .containsEntry(testProperty, "true");
-            return super.loadFileIOInternal(ioImplClassName, properties);
-          }
-        };
-    fileIOFactory.loadFileIO(realmId, InMemoryFileIO.class.getName(), Map.of(testProperty, "true"));
-  }
-
   @Test
   public void testLoadFileIOForTableLike() {
     String storageLocation = "s3://my-bucket/path/to/data";

service/common/src/testFixtures/java/org/apache/polaris/service/catalog/io/TestFileIOFactory.java

@@ -62,26 +62,6 @@ public TestFileIOFactory(
             realmEntityManagerFactory, metaStoreManagerFactory, configurationStore);
   }
 
-  @Override
-  public FileIO loadFileIO(
-      @Nonnull RealmId realmId,
-      @Nonnull String ioImplClassName,
-      @Nonnull Map<String, String> properties) {
-    loadFileIOExceptionSupplier.ifPresent(
-        s -> {
-          throw s.get();
-        });
-
-    TestFileIO wrapped =
-        new TestFileIO(
-            defaultFileIOFactory.loadFileIO(realmId, ioImplClassName, properties),
-            newInputFileExceptionSupplier,
-            newOutputFileExceptionSupplier,
-            getLengthExceptionSupplier);
-    ios.add(wrapped);
-    return wrapped;
-  }
-
   @Override
   public FileIO loadFileIO(
       @Nonnull RealmId realmId,