Self-review

Author: tmater

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAdlsIntegrationTestBase.java

@@ -18,9 +18,8 @@
  */
 package org.apache.polaris.service.it.test;
 
-import com.google.common.base.Strings;
+import java.io.File;
 import java.util.List;
-import org.apache.hadoop.fs.Path;
 import org.apache.polaris.core.admin.model.AzureStorageConfigInfo;
 import org.apache.polaris.core.admin.model.StorageConfigInfo;
 import org.apache.polaris.core.storage.StorageUtil;
@@ -38,12 +37,12 @@ protected StorageConfigInfo getStorageConfigInfo() {
         .setStorageType(StorageConfigInfo.StorageTypeEnum.AZURE)
         .setAllowedLocations(
             List.of(
-                StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, Path.SEPARATOR)))
+                StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, File.separator)))
         .build();
   }
 
   @Override
   protected String getCustomMetadataLocationDir() {
-    return new Path(BASE_LOCATION, POLARIS_IT_CUSTOM_SUBDIR).toString();
+    return StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, File.separator);
   }
 }

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcsIntegrationTestBase.java

@@ -18,9 +18,8 @@
  */
 package org.apache.polaris.service.it.test;
 
-import com.google.common.base.Strings;
+import java.io.File;
 import java.util.List;
-import org.apache.hadoop.fs.Path;
 import org.apache.polaris.core.admin.model.GcpStorageConfigInfo;
 import org.apache.polaris.core.admin.model.StorageConfigInfo;
 import org.apache.polaris.core.storage.StorageUtil;
@@ -39,12 +38,12 @@ protected StorageConfigInfo getStorageConfigInfo() {
         .setStorageType(StorageConfigInfo.StorageTypeEnum.GCS)
         .setAllowedLocations(
             List.of(
-                StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, Path.SEPARATOR)))
+                StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, File.separator)))
         .build();
   }
 
   @Override
   protected String getCustomMetadataLocationDir() {
-    return new Path(BASE_LOCATION, POLARIS_IT_CUSTOM_SUBDIR).toString();
+    return StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, File.separator);
   }
 }

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewS3IntegrationTestBase.java

@@ -18,10 +18,9 @@
  */
 package org.apache.polaris.service.it.test;
 
-import com.google.common.base.Strings;
+import java.io.File;
 import java.util.List;
 import java.util.Optional;
-import org.apache.hadoop.fs.Path;
 import org.apache.polaris.core.admin.model.AwsStorageConfigInfo;
 import org.apache.polaris.core.admin.model.StorageConfigInfo;
 import org.apache.polaris.core.storage.StorageUtil;
@@ -41,12 +40,12 @@ protected StorageConfigInfo getStorageConfigInfo() {
         .setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
         .setAllowedLocations(
             List.of(
-                StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, Path.SEPARATOR)))
+                StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, File.separator)))
         .build();
   }
 
   @Override
   protected String getCustomMetadataLocationDir() {
-    return new Path(BASE_LOCATION, POLARIS_IT_CUSTOM_SUBDIR).toString();
+    return StorageUtil.concatFilePrefixes(BASE_LOCATION, POLARIS_IT_SUBDIR, File.separator);
   }
 }