fix #1246: honor ConfigProperties.UNCONFIGURED_PREFIX again (#1248)

smallrye · Nov 11, 2024 · ee0dbf9 · ee0dbf9
1 parent 098c541
commit ee0dbf9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cdi/src/main/java/io/smallrye/config/inject/ConfigExtension.java b/cdi/src/main/java/io/smallrye/config/inject/ConfigExtension.java
@@ -99,10 +99,15 @@ protected void processConfigProperties(
             // We are going to veto, because it may be a managed bean, and we will use a configurator bean
             processAnnotatedType.veto();
 
+            // Unconfigured is represented as an empty String in SmallRye Config
+            String prefix = annotatedType.getAnnotation(ConfigProperties.class).prefix();
+            if (ConfigProperties.UNCONFIGURED_PREFIX.equals(prefix)) {
+                prefix = "";
+            }
+
             // Each config class is both in SmallRyeConfig and managed by a configurator bean.
             // CDI requires more beans for injection points due to binding prefix.
-            ConfigClass properties = ConfigClass.configClass(annotatedType.getJavaClass(),
-                    annotatedType.getAnnotation(ConfigProperties.class).prefix());
+            ConfigClass properties = ConfigClass.configClass(annotatedType.getJavaClass(), prefix);
             configProperties.add(properties);
             configPropertiesBeans.add(properties);
         }

diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
@@ -57,8 +57,6 @@
           <!-- Require updates to MP TCK -->
           <excludes>
             <exclude>org.eclipse.microprofile.config.tck.ConverterTest</exclude>
-            <exclude>org.eclipse.microprofile.config.tck.ConfigPropertiesTest</exclude>
-            <exclude>org.eclipse.microprofile.config.tck.broken.ConfigPropertiesMissingPropertyInjectionTest</exclude>
           </excludes>
         </configuration>
         <executions>