From 8270d2931f6d36fb434a40c6c7b6a5b9e5246653 Mon Sep 17 00:00:00 2001
From: Roberto Cortez <radcortez@yahoo.com>
Date: Tue, 7 May 2024 14:21:48 +0100
Subject: [PATCH] Discover SecretKeyHandlers by default (#1165)

---
 .../io/smallrye/config/SmallRyeConfigFactory.java     | 11 +++++++----
 testsuite/extra/pom.xml                               |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfigFactory.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfigFactory.java
index b7bd6be68..c5f6f57a0 100644
--- a/implementation/src/main/java/io/smallrye/config/SmallRyeConfigFactory.java
+++ b/implementation/src/main/java/io/smallrye/config/SmallRyeConfigFactory.java
@@ -50,13 +50,16 @@ static final class Default extends SmallRyeConfigFactory {
         }
 
         public SmallRyeConfig getConfigFor(SmallRyeConfigProviderResolver configProviderResolver, ClassLoader classLoader) {
-            return configProviderResolver.getBuilder().forClassLoader(classLoader)
+            return configProviderResolver.getBuilder()
+                    .forClassLoader(classLoader)
                     .addDiscoveredCustomizers()
-                    .addDefaultSources()
+                    .addDiscoveredInterceptors()
+                    .addDiscoveredConverters()
+                    .addDiscoveredSecretKeysHandlers()
                     .addDefaultInterceptors()
+                    .addDefaultSources()
                     .addDiscoveredSources()
-                    .addDiscoveredConverters()
-                    .addDiscoveredInterceptors()
+                    .addDiscoveredValidator()
                     .build();
         }
     }
diff --git a/testsuite/extra/pom.xml b/testsuite/extra/pom.xml
index fba846f3c..374ea00c5 100644
--- a/testsuite/extra/pom.xml
+++ b/testsuite/extra/pom.xml
@@ -147,6 +147,10 @@
             </property>
           </properties>
           <threadCount>1</threadCount>
+          <systemPropertyVariables>
+            <smallrye.config.secret-handler.jasypt.password>dummy</smallrye.config.secret-handler.jasypt.password>
+            <smallrye.config.secret-handler.jasypt.algorithm>PBEWithHMACSHA512AndAES_256</smallrye.config.secret-handler.jasypt.algorithm>
+          </systemPropertyVariables>
         </configuration>
         <dependencies>
           <dependency>