Address feedbacks

Author: singhpk234

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/DatabaseType.java

@@ -18,6 +18,8 @@
  */
 package org.apache.polaris.extension.persistence.relational.jdbc;
 
+import java.util.Locale;
+
 public enum DatabaseType {
   POSTGRES("postgres"),
   H2("h2");
@@ -34,10 +36,14 @@ public String getDisplayName() {
   }
 
   public static DatabaseType fromDisplayName(String displayName) {
-    return switch (displayName) {
+    return switch (displayName.toLowerCase(Locale.ROOT)) {
       case "h2" -> DatabaseType.H2;
       case "postgresql" -> DatabaseType.POSTGRES;
       default -> throw new IllegalStateException("Unsupported DatabaseType: '" + displayName + "'");
     };
   }
+
+  public String getInitScriptResource() {
+    return String.format("%s/schema-v1.sql", this.getDisplayName());
+  }
 }

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java

@@ -18,6 +18,7 @@
  */
 package org.apache.polaris.extension.persistence.relational.jdbc;
 
+import com.google.common.base.Preconditions;
 import io.smallrye.common.annotation.Identifier;
 import jakarta.annotation.Nullable;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -26,7 +27,6 @@
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.function.Supplier;
 import javax.sql.DataSource;
@@ -112,16 +112,13 @@ private void initializeForRealm(
 
   private DatasourceOperations getDatasourceOperations(boolean isBootstrap) {
     // TODO: remove when multiple dataSources are supported.
-    if (dataSources.size() > 1) {
-      throw new IllegalStateException("More than one dataSources configured");
-    }
+    Preconditions.checkState(dataSources.size() == 1, "More than one dataSources configured");
     DatasourceOperations databaseOperations = new DatasourceOperations(dataSources.getFirst());
     if (isBootstrap) {
       try {
         DatabaseType databaseType;
         try (Connection connection = dataSources.getFirst().getConnection()) {
-          String productName =
-              connection.getMetaData().getDatabaseProductName().toLowerCase(Locale.ROOT);
+          String productName = connection.getMetaData().getDatabaseProductName();
           databaseType = DatabaseType.fromDisplayName(productName);
         }
         databaseOperations.executeScript(

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/models/ModelEntity.java

@@ -152,8 +152,11 @@ public ModelEntity fromResultSet(ResultSet r) throws SQLException {
         .purgeTimestamp(r.getObject("purge_timestamp", Long.class))
         .toPurgeTimestamp(r.getObject("to_purge_timestamp", Long.class))
         .lastUpdateTimestamp(r.getObject("last_update_timestamp", Long.class))
-        .properties(r.getString("properties"))
-        .internalProperties(r.getString("internal_properties"))
+        .properties(
+            r.getString("properties")) // required for extracting when the underlying type is JSONB
+        .internalProperties(
+            r.getString(
+                "internal_properties")) // required for extracting when the underlying type is JSONB
         .grantRecordsVersion(r.getObject("grant_records_version", Integer.class))
         .build();
   }

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

@@ -84,7 +84,7 @@ static void close() throws Exception {
 
   @BeforeEach
   public void before(TestInfo testInfo) {
-    org.junit.jupiter.api.Assumptions.assumeFalse(shouldSkip());
+    Assumptions.assumeThat(shouldSkip()).isFalse();
 
     String principalName = client.newEntityName("snowman-rest");
     String principalRoleName = client.newEntityName("rest-admin");