add safeget method

dhis2 · Nov 27, 2024 · 164a659 · 164a659
1 parent d17f207
commit 164a659
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java b/...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java
@@ -157,9 +157,7 @@ private Properties getAdditionalProperties(DhisConfigurationProvider dhisConfig)
       properties.put(AvailableSettings.USE_QUERY_CACHE, dhisConfig.getProperty(USE_QUERY_CACHE));
     }
 
-    properties.put(
-        AvailableSettings.HBM2DDL_AUTO,
-        Action.valueOf(dhisConfig.getProperty(CONNECTION_SCHEMA).toUpperCase()));
+    properties.put(AvailableSettings.HBM2DDL_AUTO, getHibernateSchemaAction(dhisConfig));
 
     // TODO: this is anti-pattern and should be turn off
     properties.put("hibernate.allow_update_outside_transaction", "true");
@@ -197,4 +195,16 @@ private String[] loadResources() {
   private boolean shouldGenerateDDL(DhisConfigurationProvider dhisConfig) {
     return "update".equals(dhisConfig.getProperty(ConfigurationKey.CONNECTION_SCHEMA));
   }
+
+  private Action getHibernateSchemaAction(DhisConfigurationProvider dhisConfig) {
+    try {
+      return Action.interpretHbm2ddlSetting(dhisConfig.getProperty(CONNECTION_SCHEMA));
+    } catch (Exception e) {
+      log.warn(
+          String.format(
+              "Invalid value for property connection.schema: %s. Using validate as default mode.",
+              dhisConfig.getProperty(CONNECTION_SCHEMA)));
+      return Action.VALIDATE;
+    }
+  }
 }