Disable expressions when getting datasource properties for restart

Malandril · Jul 18, 2024 · a05f569 · a05f569
1 parent 6a7e471
commit a05f569
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
@@ -6,10 +6,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -42,6 +42,7 @@
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
+import io.smallrye.config.Expressions;
 import io.smallrye.config.SmallRyeConfig;
 
 @BuildSteps(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class)
@@ -202,18 +203,14 @@ public void run() {
      * If a property ends with {@code .} then it will also trigger a restart on any sub properties change
      */
     private static Map<String, String> getRestartTriggeringPropertiesValues() {
-        Map<String, String> datasourceProperties;
-        try {
-            datasourceProperties = ConfigProvider.getConfig()
-                    .unwrap(SmallRyeConfig.class)
-                    .getOptionalValues("quarkus.datasource",
-                            String.class,
-                            String.class)
-                    .orElse(Map.of());
-        } catch (NoSuchElementException e) {
-            log.error("Could not get datasource properties", e);
-            datasourceProperties = Map.of();
-        }
+        Map<String, String> datasourceProperties = Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
+            @Override
+            public Map<String, String> get() {
+                return ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getValues("quarkus.datasource", String.class,
+                        String.class);
+            }
+        });
+
         Map<String, String> filteredProperties = new HashMap<>();
         for (var entry : datasourceProperties.entrySet()) {
             if (!EXCLUDED_RESTART_PROPERTIES.contains(entry.getKey())) {