Merge pull request quarkusio#40120 from dmlloyd/fix-40047

Prevent double-warning when using deprecated properties
cescoffier · Apr 19, 2024 · 37fbf8a · 37fbf8a
2 parents c85f5e2 + 09d77d0
commit 37fbf8a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -1086,6 +1086,7 @@ public String getValue(final String propertyName) {
             builder.getSources().clear();
             builder.getSourceProviders().clear();
             builder.setAddDefaultSources(false)
+                    .withInterceptors(ConfigCompatibility.FrontEnd.nonLoggingInstance(), ConfigCompatibility.BackEnd.instance())
                     .addDiscoveredCustomizers()
                     .withProfiles(config.getProfiles())
                     .withSources(sourceProperties);
@@ -1099,6 +1100,7 @@ public String getValue(final String propertyName) {
             builder.getSources().clear();
             builder.getSourceProviders().clear();
             builder.setAddDefaultSources(false)
+                    .withInterceptors(ConfigCompatibility.FrontEnd.nonLoggingInstance(), ConfigCompatibility.BackEnd.instance())
                     .addDiscoveredCustomizers()
                     .withSources(sourceProperties)
                     .withSources(new MapBackedConfigSource(

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java
@@ -114,9 +114,13 @@ public static final class FrontEnd implements ConfigSourceInterceptor {
         @Serial
         private static final long serialVersionUID = -3438497970389074611L;
 
-        private static final FrontEnd instance = new FrontEnd();
+        private static final FrontEnd instance = new FrontEnd(true);
+        private static final FrontEnd nonLoggingInstance = new FrontEnd(false);
 
-        private FrontEnd() {
+        private final boolean logging;
+
+        private FrontEnd(final boolean logging) {
+            this.logging = logging;
         }
 
         public ConfigValue getValue(final ConfigSourceInterceptorContext context, final String name) {
@@ -155,11 +159,13 @@ public boolean hasNext() {
                         // get the replacement names
                         List<String> list = fn.apply(context, new NameIterator(next));
                         subIter = list.iterator();
-                        // todo: print these warnings when mapping the configuration so they cannot appear more than once
-                        if (list.isEmpty()) {
-                            log.warnf("Configuration property '%s' has been deprecated and will be ignored", next);
-                        } else {
-                            log.warnf("Configuration property '%s' has been deprecated and replaced by: %s", next, list);
+                        if (logging) {
+                            // todo: print these warnings when mapping the configuration so they cannot appear more than once
+                            if (list.isEmpty()) {
+                                log.warnf("Configuration property '%s' has been deprecated and will be ignored", next);
+                            } else {
+                                log.warnf("Configuration property '%s' has been deprecated and replaced by: %s", next, list);
+                            }
                         }
                     }
                     return true;
@@ -179,6 +185,10 @@ public String next() {
         public static FrontEnd instance() {
             return instance;
         }
+
+        public static FrontEnd nonLoggingInstance() {
+            return nonLoggingInstance;
+        }
     }
 
     /**