Preserve type-based user-override for root EventHubClientBuilder

The previous name-based @ConditionalOnMissingBean broke backward compatibility: a user-defined EventHubClientBuilder bean registered under a custom name no longer suppressed the auto-configured root builder. Add a custom condition that ignores only the three reserved auto-config bean names (root, consumer-dedicated, producer-dedicated) so any other EventHubClientBuilder bean is treated as a user override and suppresses auto-configuration, while still allowing the dedicated builders to coexist with the root one.

Author: rujche

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsClientBuilderConfiguration.java

@@ -19,6 +19,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
@@ -42,6 +43,7 @@ class AzureEventHubsClientBuilderConfiguration {
 
     @Bean(EVENT_HUB_CLIENT_BUILDER_BEAN_NAME)
     @ConditionalOnMissingBean(name = EVENT_HUB_CLIENT_BUILDER_BEAN_NAME)
+    @Conditional(OnMissingUserDefinedEventHubClientBuilderCondition.class)
     EventHubClientBuilder eventHubClientBuilder(@Qualifier(EVENT_HUB_CLIENT_BUILDER_FACTORY_BEAN_NAME)
                                                     EventHubClientBuilderFactory factory) {
         return factory.build();

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/OnMissingUserDefinedEventHubClientBuilderCondition.java

@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.autoconfigure.implementation.eventhubs;
+
+import com.azure.messaging.eventhubs.EventHubClientBuilder;
+import com.azure.spring.cloud.autoconfigure.implementation.context.AzureContextUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.ConfigurationCondition;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import java.util.Set;
+
+/**
+ * Matches when no user-defined {@link EventHubClientBuilder} bean is present in the context.
+ *
+ * <p>Beans registered under the well-known auto-configuration bean names
+ * ({@link AzureContextUtils#EVENT_HUB_CLIENT_BUILDER_BEAN_NAME},
+ * {@link AzureContextUtils#EVENT_HUB_CONSUMER_CLIENT_BUILDER_BEAN_NAME},
+ * {@link AzureContextUtils#EVENT_HUB_PRODUCER_CLIENT_BUILDER_BEAN_NAME}) are not considered
+ * user-defined: the first is the root builder itself; the latter two are dedicated builders
+ * created by the consumer/producer auto-configurations and must not suppress the root builder.
+ */
+class OnMissingUserDefinedEventHubClientBuilderCondition extends SpringBootCondition implements ConfigurationCondition {
+
+    private static final Set<String> RESERVED_BUILDER_BEAN_NAMES = Set.of(
+        AzureContextUtils.EVENT_HUB_CLIENT_BUILDER_BEAN_NAME,
+        AzureContextUtils.EVENT_HUB_CONSUMER_CLIENT_BUILDER_BEAN_NAME,
+        AzureContextUtils.EVENT_HUB_PRODUCER_CLIENT_BUILDER_BEAN_NAME
+    );
+
+    @Override
+    public ConfigurationPhase getConfigurationPhase() {
+        return ConfigurationPhase.REGISTER_BEAN;
+    }
+
+    @Override
+    public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        String[] beanNames = context.getBeanFactory().getBeanNamesForType(EventHubClientBuilder.class, true, false);
+        for (String name : beanNames) {
+            if (!RESERVED_BUILDER_BEAN_NAMES.contains(name)) {
+                return ConditionOutcome.noMatch("found user-defined EventHubClientBuilder bean: " + name);
+            }
+        }
+        return ConditionOutcome.match("no user-defined EventHubClientBuilder bean found");
+    }
+}