Address review feedback

Author: singhpk234

extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkProductionReadinessChecks.java

@@ -20,28 +20,34 @@
 
 import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_URL;
 
+import io.smallrye.common.annotation.Identifier;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
 import jakarta.enterprise.inject.Produces;
 import java.io.IOException;
 import java.nio.file.Path;
 import org.apache.polaris.core.config.ProductionReadinessCheck;
 import org.apache.polaris.core.config.ProductionReadinessCheck.Error;
+import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @ApplicationScoped
 public class EclipseLinkProductionReadinessChecks {
-
   private static final Logger LOGGER =
       LoggerFactory.getLogger(EclipseLinkProductionReadinessChecks.class);
 
   @Produces
-  public ProductionReadinessCheck checkJdbcUrl(
-      EclipseLinkConfiguration eclipseLinkConfiguration,
-      @ConfigProperty(name = "polaris.persistence.type") String persistenceType) {
+  public ProductionReadinessCheck checkEclipseLink(
+      @ConfigProperty(name = "polaris.persistence.type") String persistenceType,
+      @Any Instance<MetaStoreManagerFactory> metaStoreManagerFactories,
+      EclipseLinkConfiguration eclipseLinkConfiguration) {
     // This check should only be applicable when persistence uses EclipseLink.
-    if (!("eclipse-link".equalsIgnoreCase(persistenceType))) {
+    MetaStoreManagerFactory metaStoreManagerFactory =
+        metaStoreManagerFactories.select(Identifier.Literal.of(persistenceType)).get();
+    if (!(metaStoreManagerFactory instanceof EclipseLinkPolarisMetaStoreManagerFactory)) {
       return ProductionReadinessCheck.OK;
     }
 

extension/persistence/relational-jdbc/build.gradle.kts

@@ -34,6 +34,7 @@ dependencies {
   compileOnly(libs.jakarta.inject.api)
 
   implementation(libs.smallrye.common.annotation) // @Identifier
+  compileOnly(libs.microprofile.config.api) // @ConfigMapping
 
   testImplementation(libs.mockito.junit.jupiter)
 

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

@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.polaris.extension.persistence.relational.jdbc;
+
+import io.smallrye.common.annotation.Identifier;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import java.util.Optional;
+import org.apache.polaris.core.config.ProductionReadinessCheck;
+import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@ApplicationScoped
+public class RelationalJdbcProductionReadinessChecks {
+  @Produces
+  public ProductionReadinessCheck checkRelationalJdbc(
+      @ConfigProperty(name = "quarkus.datasource.jdbc.url") Optional<String> jdbcUrl,
+      @ConfigProperty(name = "polaris.persistence.type") String persistenceType,
+      @Any Instance<MetaStoreManagerFactory> metaStoreManagerFactories) {
+    // This check should only be applicable when persistence uses RelationalJdbc.
+    if (!(metaStoreManagerFactories.select(Identifier.Literal.of(persistenceType)).get()
+        instanceof JdbcMetaStoreManagerFactory)) {
+      return ProductionReadinessCheck.OK;
+    }
+
+    if (jdbcUrl.isPresent() && jdbcUrl.get().startsWith("jdbc:h2")) {
+      return ProductionReadinessCheck.of(
+          ProductionReadinessCheck.Error.of(
+              "The current persistence (jdbc:h2) is intended for tests only.",
+              "quarkus.datasource.jdbc.url"));
+    }
+    return ProductionReadinessCheck.OK;
+  }
+}

gradle/libs.versions.toml

@@ -73,6 +73,7 @@ junit-bom = { module = "org.junit:junit-bom", version = "5.12.2" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.18" }
 micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.15.0" }
 microprofile-fault-tolerance-api = { module = "org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-api", version = "4.1.2" }
+microprofile-config-api = {module = "org.eclipse.microprofile.config:microprofile-config-api", version = "3.0.3"}
 mockito-core = { module = "org.mockito:mockito-core", version = "5.18.0" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "5.18.0" }
 opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version = "1.50.0" }

quarkus/server/distribution/LICENSE

@@ -1476,6 +1476,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
 Group: org.eclipse.microprofile.config Name: microprofile-config-api Version: 3.1
 Group: org.eclipse.microprofile.context-propagation Name: microprofile-context-propagation-api Version: 1.3
 Group: org.eclipse.microprofile.fault-tolerance Name: microprofile-fault-tolerance-api Version: 4.1.1
+Group: org.eclipse.microprofile.config Name: microprofile-config-api Version: 3.0.3
 Group: org.eclipse.microprofile.health Name: microprofile-health-api Version: 4.0.1
 Group: org.eclipse.microprofile.jwt Name: microprofile-jwt-auth-api Version: 2.1
 Group: org.eclipse.microprofile.reactive-streams-operators Name: microprofile-reactive-streams-operators-api Version: 3.0.1