servicebus jms autoconfiguration enabled fix (Azure#29313)

* servicebus jms autoconfiguration enabled option fix

* servicebus jms autoconfiguration enabled  add changelog

Author: jialigit

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -282,6 +282,11 @@
           "new": "class com.azure.spring.cloud.autoconfigure.context.AzureTokenCredentialAutoConfiguration",
           "justification": "Fixes a bug."
         },
+        {
+          "code": "java.annotation.added",
+          "new": "class com.azure.spring.cloud.autoconfigure.jms.ServiceBusJmsAutoConfiguration",
+          "justification": "Fixes a bug."
+        },
         {
           "code": "java.missing.newSuperType",
           "old": "class com.azure.messaging.eventhubs.EventData",

sdk/spring/CHANGELOG.md

@@ -24,6 +24,12 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
 #### Dependency Updates
 - Upgrade spring-security to 5.6.4 to address [CVE-2022-22978](https://spring.io/blog/2022/05/15/cve-2022-22978-authorization-bypass-in-regexrequestmatcher) [#29304](https://github.com/Azure/azure-sdk-for-java/pull/29304).
 
+#### Features Added
+- Add `enabled` option in `AzureServiceBusJmsProperties` [#29232](https://github.com/Azure/azure-sdk-for-java/issues/29232).
+
+#### Bugs Fixed
+- Fix the Service Bus JMS autoconfiguration logic error [#29313](https://github.com/Azure/azure-sdk-for-java/pull/29313).
+
 ### Spring Messaging Azure Service Bus
 This section includes changes in the `spring-messaging-azure-servicebus` module.
 

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfiguration.java

@@ -17,6 +17,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.JmsProperties;
 import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration;
@@ -42,6 +43,7 @@
 @AutoConfigureAfter({
     JndiConnectionFactoryAutoConfiguration.class,
     AzureServiceBusResourceManagerAutoConfiguration.class })
+@ConditionalOnProperty(value = "spring.jms.servicebus.enabled", matchIfMissing = true)
 @ConditionalOnClass({ ConnectionFactory.class, JmsConnectionFactory.class, JmsTemplate.class })
 @EnableConfigurationProperties({ AzureServiceBusJmsProperties.class, JmsProperties.class })
 @Import({ ServiceBusJmsConnectionFactoryConfiguration.class, ServiceBusJmsContainerConfiguration.class })

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/properties/AzureServiceBusJmsProperties.java

@@ -24,6 +24,11 @@ public class AzureServiceBusJmsProperties implements InitializingBean {
      */
     public static final String PREFIX = "spring.jms.servicebus";
 
+    /**
+     * Whether to enable Servive Bus JMS autoconfiguration.
+     */
+    private boolean enabled = true;
+
     private static final String DEFAULT_REMOTE_URL = "amqp://localhost:5672";
 
     private static final String AMQP_URI_FORMAT = "amqps://%s?amqp.idleTimeout=%d";
@@ -66,6 +71,22 @@ public class AzureServiceBusJmsProperties implements InitializingBean {
      */
     private String password;
 
+    /**
+     * Whether to enable Service Bus JMS autoconfiguration.
+     * @return Whether to enable Service Bus autoconfiguration
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Set whether to enable Service Bus JMS autoconfiguation.
+     * @param enabled whether to enable Service Bus autoconfiguration.
+     */
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
     /**
      * Get the URL of the AMQP broker.
      * @return the URL of the AMQP broker.

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfigurationTests.java

@@ -152,6 +152,29 @@ void autoconfigurationEnabledAndContextSuccessWithPremiumTier(String pricingTier
             });
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "basic", "standard", "premium" })
+    void autoconfigurationDisabled(String pricingTier) {
+        this.contextRunner
+            .withPropertyValues(
+                "spring.jms.servicebus.enabled=false",
+                "spring.jms.servicebus.pricing-tier=" + pricingTier,
+                "spring.jms.servicebus.connection-string=" + CONNECTION_STRING)
+            .run(context -> {
+                assertThat(context).doesNotHaveBean(AzureServiceBusJmsProperties.class);
+            });
+    }
+
+    @Test
+    void autoconfigurationDisabledCase2() {
+        this.contextRunner
+            .withPropertyValues(
+                "spring.jms.servicebus.enabled=false")
+            .run(context -> {
+                assertThat(context).doesNotHaveBean(AzureServiceBusJmsProperties.class);
+            });
+    }
+
     @ParameterizedTest
     @ValueSource(strings = { "basic", "standard", "premium" })
     void doesnotHaveBeanOfAzureServiceBusJmsPropertiesBeanPostProcessor(String pricingTier) {