Fix for ServiceLoaderFeature (#11402)

ServiceLoaderFeature did not include all the @requires annotations, as some were added with the @requirements. I included such in the native-image beforeAnalysis. As an example, this fixes the usage of condition in io.micronaut.configuration.metrics.binder.web.ClientRequestMetricRegistryFilter.
micronaut-projects · Dec 3, 2024 · a1d34fa · a1d34fa
1 parent c914e42
commit a1d34fa
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/src/main/java/io/micronaut/core/io/service/ServiceLoaderFeature.java b/core/src/main/java/io/micronaut/core/io/service/ServiceLoaderFeature.java
@@ -89,6 +89,12 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
                             }
                             Class<?> beanType = beanInfo.getBeanType();
                             List<AnnotationValue<Annotation>> values = beanInfo.getAnnotationMetadata().getAnnotationValuesByName("io.micronaut.context.annotation.Requires");
+                            if (values.isEmpty()) {
+                                AnnotationValue<Annotation> requirements = beanInfo.getAnnotationMetadata().getAnnotation("io.micronaut.context.annotation.Requirements");
+                                if (requirements != null) {
+                                    values = requirements.getAnnotations("value");
+                                }
+                            }
                             if (!values.isEmpty()) {
                                 for (AnnotationValue<Annotation> value : values) {
                                     String[] classNames = EMPTY_STRING_ARRAY;