[GenAI] Fix 11815: Modifications on AbstractInitializableBeanDefinition.resolveBean

inject/src/main/java/io/micronaut/context/AbstractInitializableBeanDefinition.java

@@ -2148,7 +2148,8 @@ private Object resolveValue(BeanResolutionContext resolutionContext, BeanContext
             if (isIterable() && getAnnotationMetadata().hasDeclaredAnnotation(EachBean.class)) {
                 throw new DisabledBeanException("Bean [" + getBeanType().getSimpleName() + "] disabled by parent: " + e.getMessage());
             } else {
-                throw new DependencyInjectionException(resolutionContext, e);
+                // Propagate DisabledBeanException as-is so upstream logic can handle disabled dependencies
+                throw e;
             }
         } catch (NoSuchBeanException e) {
             throw new DependencyInjectionException(resolutionContext, e);

test-suite-kotlin-ksp/src/test/kotlin/io/micronaut/disabledbean/DisabledBeanRequiresTest.kt

@@ -0,0 +1,41 @@
+package io.micronaut.disabledbean
+
+import io.micronaut.context.ApplicationContext
+import io.micronaut.context.annotation.Factory
+import io.micronaut.context.annotation.Requires
+import io.micronaut.context.exceptions.DisabledBeanException
+import jakarta.inject.Singleton
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+class DisabledBeanRequiresTest {
+    @Test
+    fun testConditionalMakeAnotherBeanUnavailable() {
+        val ctx = ApplicationContext.run()
+        try {
+            val opt = ctx.findBean(AnotherBean::class.java)
+            // Expected: AnotherBean should not be available because MyBean is disabled via DisabledBeanException
+            assertTrue(opt.isEmpty, "AnotherBean should not be available when MyBean is disabled")
+        } finally {
+            ctx.close()
+        }
+    }
+}
+
+class MyBean
+
+class AnotherBean(val myBean: MyBean)
+
+@Factory
+class MyFactory {
+    @Singleton
+    fun myBean(): MyBean {
+        throw DisabledBeanException("MyBean Disabled")
+    }
+
+    @Singleton
+    @Requires(bean = MyBean::class)
+    fun anotherBean(myBean: MyBean): AnotherBean {
+        return AnotherBean(myBean)
+    }
+}