Addressing review comments

Author: pavibhai

integration-tests/src/main/java/org/apache/polaris/service/it/ext/PolarisSparkIntegrationTestBase.java

@@ -62,7 +62,6 @@ public abstract class PolarisSparkIntegrationTestBase {
   protected String sparkToken;
   protected String catalogName;
   protected String externalCatalogName;
-  protected String s3Scheme = "s3";
 
   protected URI warehouseDir;
 
@@ -96,9 +95,9 @@ public void before(
             .setExternalId("externalId")
             .setUserArn("userArn")
             .setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
-            .setAllowedLocations(List.of(s3Scheme + "://my-old-bucket/path/to/data"))
+            .setAllowedLocations(List.of("s3://my-old-bucket/path/to/data"))
             .build();
-    CatalogProperties props = new CatalogProperties(s3Scheme + "://my-bucket/path/to/data");
+    CatalogProperties props = new CatalogProperties("s3://my-bucket/path/to/data");
     props.putAll(
         Map.of(
             "table-default.s3.endpoint",
@@ -129,7 +128,7 @@ public void before(
 
     managementApi.createCatalog(catalog);
 
-    CatalogProperties externalProps = new CatalogProperties(s3Scheme + "://my-bucket/path/to/data");
+    CatalogProperties externalProps = new CatalogProperties("s3://my-bucket/path/to/data");
     externalProps.putAll(
         Map.of(
             "table-default.s3.endpoint",

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkCatalogIcebergIT.java

@@ -21,47 +21,31 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.apache.spark.sql.SparkSession;
 
-public class SparkCatalogIcebergIT {
-
-  abstract static class BaseTest extends SparkCatalogBaseIT {
-    /** Initialize the spark catalog to use the iceberg spark catalog. */
-    @Override
-    protected SparkSession.Builder withCatalog(SparkSession.Builder builder, String catalogName) {
-      return builder
-          .config(
-              "spark.sql.extensions",
-              "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions")
-          .config(
-              String.format("spark.sql.catalog.%s", catalogName),
-              "org.apache.iceberg.spark.SparkCatalog")
-          .config("spark.sql.warehouse.dir", warehouseDir.toString())
-          .config(String.format("spark.sql.catalog.%s.type", catalogName), "rest")
-          .config(
-              String.format("spark.sql.catalog.%s.uri", catalogName),
-              endpoints.catalogApiEndpoint().toString())
-          .config(String.format("spark.sql.catalog.%s.warehouse", catalogName), catalogName)
-          .config(String.format("spark.sql.catalog.%s.scope", catalogName), "PRINCIPAL_ROLE:ALL")
-          .config(
-              String.format("spark.sql.catalog.%s.header.realm", catalogName), endpoints.realmId())
-          .config(String.format("spark.sql.catalog.%s.token", catalogName), sparkToken)
-          .config(String.format("spark.sql.catalog.%s.s3.access-key-id", catalogName), "fakekey")
-          .config(
-              String.format("spark.sql.catalog.%s.s3.secret-access-key", catalogName), "fakesecret")
-          .config(String.format("spark.sql.catalog.%s.s3.region", catalogName), "us-west-2");
-    }
-  }
-
-  @QuarkusIntegrationTest
-  static class S3ATest extends BaseTest {
-    public S3ATest() {
-      s3Scheme = "s3a";
-    }
-  }
-
-  @QuarkusIntegrationTest
-  static class S3Test extends BaseTest {
-    public S3Test() {
-      s3Scheme = "s3";
-    }
+@QuarkusIntegrationTest
+public class SparkCatalogIcebergIT extends SparkCatalogBaseIT {
+  /** Initialize the spark catalog to use the iceberg spark catalog. */
+  @Override
+  protected SparkSession.Builder withCatalog(SparkSession.Builder builder, String catalogName) {
+    return builder
+        .config(
+            "spark.sql.extensions",
+            "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions")
+        .config(
+            String.format("spark.sql.catalog.%s", catalogName),
+            "org.apache.iceberg.spark.SparkCatalog")
+        .config("spark.sql.warehouse.dir", warehouseDir.toString())
+        .config(String.format("spark.sql.catalog.%s.type", catalogName), "rest")
+        .config(
+            String.format("spark.sql.catalog.%s.uri", catalogName),
+            endpoints.catalogApiEndpoint().toString())
+        .config(String.format("spark.sql.catalog.%s.warehouse", catalogName), catalogName)
+        .config(String.format("spark.sql.catalog.%s.scope", catalogName), "PRINCIPAL_ROLE:ALL")
+        .config(
+            String.format("spark.sql.catalog.%s.header.realm", catalogName), endpoints.realmId())
+        .config(String.format("spark.sql.catalog.%s.token", catalogName), sparkToken)
+        .config(String.format("spark.sql.catalog.%s.s3.access-key-id", catalogName), "fakekey")
+        .config(
+            String.format("spark.sql.catalog.%s.s3.secret-access-key", catalogName), "fakesecret")
+        .config(String.format("spark.sql.catalog.%s.s3.region", catalogName), "us-west-2");
   }
 }

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkCatalogPolarisIT.java

@@ -20,18 +20,5 @@
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-public class SparkCatalogPolarisIT {
-  @QuarkusIntegrationTest
-  static class S3ATest extends SparkCatalogBaseIT {
-    public S3ATest() {
-      s3Scheme = "s3a";
-    }
-  }
-
-  @QuarkusIntegrationTest
-  static class S3Test extends SparkCatalogBaseIT {
-    public S3Test() {
-      s3Scheme = "s3";
-    }
-  }
-}
+@QuarkusIntegrationTest
+public class SparkCatalogPolarisIT extends SparkCatalogBaseIT {}