Address review comments

Author: poojanilangekar

extensions/federation/hadoop/build.gradle.kts

@@ -55,9 +55,3 @@ dependencies {
   // Logging
   implementation(libs.slf4j.api)
 }
-
-java { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
-
-tasks.withType<JavaCompile> { options.encoding = "UTF-8" }
-
-tasks.test { useJUnitPlatform() }

extensions/federation/hadoop/src/main/java/org/apache/polaris/extensions/federation/hadoop/HadoopFederatedCatalogFactory.java

@@ -27,14 +27,15 @@
 import org.apache.polaris.core.connection.AuthenticationParametersDpo;
 import org.apache.polaris.core.connection.AuthenticationType;
 import org.apache.polaris.core.connection.ConnectionConfigInfoDpo;
+import org.apache.polaris.core.connection.ConnectionType;
 import org.apache.polaris.core.connection.hadoop.HadoopConnectionConfigInfoDpo;
 import org.apache.polaris.core.secrets.UserSecretsManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Factory class for creating a Hadoop catalog handle based on connection configuration. */
 @ApplicationScoped
-@Identifier("hadoop")
+@Identifier(ConnectionType.HADOOP_FACTORY_IDENTIFIER)
 public class HadoopFederatedCatalogFactory implements ExternalCatalogFactory {
   private static final Logger LOGGER = LoggerFactory.getLogger(HadoopFederatedCatalogFactory.class);
 

polaris-core/src/main/java/org/apache/polaris/core/connection/ConnectionType.java

@@ -35,6 +35,9 @@ public enum ConnectionType {
   HADOOP(2),
   ;
 
+  public static final String ICEBERG_REST_FACTORY_IDENTIFIER = "ICEBERG_REST";
+  public static final String HADOOP_FACTORY_IDENTIFIER = "HADOOP";
+
   private static final ConnectionType[] REVERSE_MAPPING_ARRAY;
 
   static {
@@ -77,4 +80,22 @@ public enum ConnectionType {
   public int getCode() {
     return this.code;
   }
+
+  /**
+   * Get the factory identifier string used for CDI injection of the appropriate
+   * ExternalCatalogFactory.
+   *
+   * @return the factory identifier string
+   */
+  public String getFactoryIdentifier() {
+    switch (this) {
+      case ICEBERG_REST:
+        return ICEBERG_REST_FACTORY_IDENTIFIER;
+      case HADOOP:
+        return HADOOP_FACTORY_IDENTIFIER;
+      default:
+        throw new UnsupportedOperationException(
+            "No factory identifier for connection type: " + this);
+    }
+  }
 }

runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java

@@ -222,10 +222,8 @@ protected void initializeCatalog() {
       String factoryIdentifier;
       switch (connectionType) {
         case ICEBERG_REST:
-          factoryIdentifier = "iceberg-rest";
-          break;
         case HADOOP:
-          factoryIdentifier = "hadoop";
+          factoryIdentifier = connectionType.getFactoryIdentifier();
           break;
         default:
           throw new UnsupportedOperationException("Unsupported connection type: " + connectionType);

runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRESTExternalCatalogFactory.java

@@ -26,12 +26,13 @@
 import org.apache.iceberg.rest.RESTCatalog;
 import org.apache.polaris.core.catalog.ExternalCatalogFactory;
 import org.apache.polaris.core.connection.ConnectionConfigInfoDpo;
+import org.apache.polaris.core.connection.ConnectionType;
 import org.apache.polaris.core.connection.iceberg.IcebergRestConnectionConfigInfoDpo;
 import org.apache.polaris.core.secrets.UserSecretsManager;
 
 /** Factory class for creating an Iceberg REST catalog handle based on connection configuration. */
 @ApplicationScoped
-@Identifier("iceberg-rest")
+@Identifier(ConnectionType.ICEBERG_REST_FACTORY_IDENTIFIER)
 public class IcebergRESTExternalCatalogFactory implements ExternalCatalogFactory {
 
   @Override