Refactor spring messaging sb

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -2290,7 +2290,11 @@
     <Method name="OnCloseSessionAsync"/>
     <Bug pattern="NM_METHOD_NAMING_CONVENTION"/>
   </Match>
-
+  <!-- Generated implementation of SubscriptionPropertiesSupplier is using an inline class -->
+  <Match>
+    <Class name="com.azure.spring.servicebus.core.processor.DefaultServiceBusNamespaceProcessorFactory"/>
+    <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
+  </Match>
   <Match>
     <Bug pattern="UWF_NULL_FIELD"/>
     <Class name="com.azure.spring.integration.endpoint.AbstractInboundChannelAdapter"/>

eng/jacoco-test-coverage/pom.xml

@@ -554,23 +554,13 @@
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
-      <artifactId>spring-cloud-azure-stream-binder-servicebus-topic</artifactId>
-      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus-topic;current} -->
+      <artifactId>spring-cloud-azure-stream-binder-servicebus</artifactId>
+      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
-      <artifactId>spring-cloud-azure-stream-binder-servicebus-queue</artifactId>
-      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus-queue;current} -->
-    </dependency>
-    <dependency>
-      <groupId>com.azure.spring</groupId>
-      <artifactId>spring-cloud-azure-starter-stream-servicebus-queue</artifactId>
-      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-stream-servicebus-queue;current} -->
-    </dependency>
-    <dependency>
-      <groupId>com.azure.spring</groupId>
-      <artifactId>spring-cloud-azure-starter-stream-servicebus-topic</artifactId>
-      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-stream-servicebus-topic;current} -->
+      <artifactId>spring-cloud-azure-starter-stream-servicebus</artifactId>
+      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-stream-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>

eng/versioning/version_client.txt

@@ -184,14 +184,12 @@ com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;4.0.0-beta.1;4
 com.azure.spring:spring-cloud-azure-starter-integration-servicebus;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;4.0.0-beta.1;4.0.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus-queue;4.0.0-beta.1;4.0.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus-topic;4.0.0-beta.1;4.0.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-servicebus;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-starter;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;4.0.0-beta.1;4.0.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-queue;4.0.0-beta.1;4.0.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-topic;4.0.0-beta.1;4.0.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-stream-binder-test;4.0.0-beta.1;4.0.0-beta.1
 com.azure.spring:spring-cloud-azure-test-appconfiguration-config;1.0.0;1.0.0
 com.azure.spring:spring-cloud-azure-test-parent;1.0.0;1.0.0

sdk/boms/spring-cloud-azure-dependencies/pom.xml

@@ -191,12 +191,7 @@
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-stream-servicebus-queue</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-stream-servicebus-topic</artifactId>
+        <artifactId>spring-cloud-azure-starter-stream-servicebus</artifactId>
         <version>${project.version}</version>
       </dependency>
 
@@ -218,12 +213,7 @@
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-stream-binder-servicebus-topic</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-stream-binder-servicebus-queue</artifactId>
+        <artifactId>spring-cloud-azure-stream-binder-servicebus</artifactId>
         <version>${project.version}</version>
       </dependency>
 

sdk/spring/ci.yml

@@ -48,14 +48,12 @@ trigger:
       - sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml
       - sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml
       - sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml
-      - sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml
-      - sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml
+      - sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml
       - sdk/spring/spring-cloud-azure-starter/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml
-      - sdk/spring/spring-cloud-azure-stream-binder-servicebus-queue/pom.xml
-      - sdk/spring/spring-cloud-azure-stream-binder-servicebus-topic/pom.xml
+      - sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-test/pom.xml
       - sdk/spring/spring-cloud-azure-test-servicebus-binder/pom.xml
 
@@ -107,14 +105,12 @@ pr:
       - sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml
       - sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml
       - sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml
-      - sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml
-      - sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml
+      - sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml
       - sdk/spring/spring-cloud-azure-starter/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml
-      - sdk/spring/spring-cloud-azure-stream-binder-servicebus-queue/pom.xml
-      - sdk/spring/spring-cloud-azure-stream-binder-servicebus-topic/pom.xml
+      - sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml
       - sdk/spring/spring-cloud-azure-stream-binder-test/pom.xml
       - sdk/spring/spring-cloud-azure-test-servicebus-binder/pom.xml
 
@@ -269,40 +265,32 @@ extends:
         skipPublishDocMs: true
         skipUpdatePackageJson: true
         skipVerifyChangelog: true
-      - name: spring-cloud-azure-stream-binder-servicebus-core
-        groupId: com.azure.spring
-        safeName: springcloudazurestreambinderservicebuscore
-        skipPublishDocMs: true
-      - name: spring-cloud-azure-stream-binder-test
-        groupId: com.azure.spring
-        safeName: springcloudazurestreambindertest
-        skipPublishDocMs: true
-      - name: spring-cloud-azure-stream-binder-servicebus-topic
-        groupId: com.azure.spring
-        safeName: springcloudazurestreambinderservicebustopic
-        skipPublishDocMs: true
-      - name: spring-cloud-azure-starter-stream-servicebus-topic
+      - name: spring-cloud-azure-starter-stream-eventhubs
         groupId: com.azure.spring
-        safeName: springcloudazurestarterstreamservicebustopic
+        safeName: springcloudazurestarterstreameventhubs
         skipPublishDocMs: true
         skipUpdatePackageJson: true
         skipVerifyChangelog: true
-      - name: spring-cloud-azure-stream-binder-servicebus-queue
-        groupId: com.azure.spring
-        safeName: springcloudazurestreambinderservicebusqueue
-        skipPublishDocMs: true
-      - name: spring-cloud-azure-starter-stream-servicebus-topic
+      - name: spring-cloud-azure-starter-stream-servicebus
         groupId: com.azure.spring
-        safeName: springcloudazurestarterstreamservicebustopic
+        safeName: springcloudazurestarterstreamservicebus
         skipPublishDocMs: true
         skipUpdatePackageJson: true
         skipVerifyChangelog: true
-      - name: spring-cloud-azure-starter-stream-eventhubs
+      - name: spring-cloud-azure-starter-storage-queue
         groupId: com.azure.spring
-        safeName: springcloudazurestarterstreameventhubs
+        safeName: springcloudazurestarterstoragequeue
         skipPublishDocMs: true
         skipUpdatePackageJson: true
         skipVerifyChangelog: true
+      - name: spring-cloud-azure-stream-binder-servicebus-core
+        groupId: com.azure.spring
+        safeName: springcloudazurestreambinderservicebuscore
+        skipPublishDocMs: true
+      - name: spring-cloud-azure-stream-binder-servicebus
+        groupId: com.azure.spring
+        safeName: springcloudazurestreambinderservicebus
+        skipPublishDocMs: true
       - name: spring-cloud-azure-stream-binder-eventhubs
         groupId: com.azure.spring
         safeName: springcloudazurestreambindereventhubs
@@ -311,3 +299,7 @@ extends:
         groupId: com.azure.spring
         safeName: springcloudazurestreambindereventhubscore
         skipPublishDocMs: true
+      - name: spring-cloud-azure-stream-binder-test
+        groupId: com.azure.spring
+        safeName: springcloudazurestreambindertest
+        skipPublishDocMs: true

sdk/spring/pom.xml

@@ -31,8 +31,7 @@
         <module>spring-cloud-azure-stream-binder-eventhubs-core</module>
         <module>spring-cloud-azure-stream-binder-eventhubs</module>
         <module>spring-cloud-azure-stream-binder-servicebus-core</module>
-        <module>spring-cloud-azure-stream-binder-servicebus-queue</module>
-        <module>spring-cloud-azure-stream-binder-servicebus-topic</module>
+        <module>spring-cloud-azure-stream-binder-servicebus</module>
       </modules>
       <dependencies>
         <dependency>
@@ -112,13 +111,8 @@
         </dependency>
         <dependency>
           <groupId>com.azure.spring</groupId>
-          <artifactId>spring-cloud-azure-stream-binder-servicebus-queue</artifactId>
-          <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus-queue;current} -->
-        </dependency>
-        <dependency>
-          <groupId>com.azure.spring</groupId>
-          <artifactId>spring-cloud-azure-stream-binder-servicebus-topic</artifactId>
-          <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus-topic;current} -->
+          <artifactId>spring-cloud-azure-stream-binder-servicebus</artifactId>
+          <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus;current} -->
         </dependency>
       </dependencies>
 
@@ -190,14 +184,12 @@
         <module>spring-cloud-azure-starter-integration-servicebus</module>
         <module>spring-cloud-azure-starter-integration-storage-queue</module>
         <module>spring-cloud-azure-starter-stream-eventhubs</module>
-        <module>spring-cloud-azure-starter-stream-servicebus-queue</module>
-        <module>spring-cloud-azure-starter-stream-servicebus-topic</module>
+        <module>spring-cloud-azure-starter-stream-servicebus</module>
         <module>spring-cloud-azure-starter</module>
         <module>spring-cloud-azure-stream-binder-eventhubs-core</module>
         <module>spring-cloud-azure-stream-binder-eventhubs</module>
         <module>spring-cloud-azure-stream-binder-servicebus-core</module>
-        <module>spring-cloud-azure-stream-binder-servicebus-queue</module>
-        <module>spring-cloud-azure-stream-binder-servicebus-topic</module>
+        <module>spring-cloud-azure-stream-binder-servicebus</module>
         <module>spring-cloud-azure-stream-binder-test</module>
         <module>spring-cloud-azure-test-servicebus-binder</module>
       </modules>
@@ -243,11 +235,9 @@
         <module>spring-cloud-azure-stream-binder-eventhubs-core</module>
         <module>spring-cloud-azure-stream-binder-eventhubs</module>
         <module>spring-cloud-azure-stream-binder-servicebus-core</module>
-        <module>spring-cloud-azure-stream-binder-servicebus-queue</module>
-        <module>spring-cloud-azure-stream-binder-servicebus-topic</module>
+        <module>spring-cloud-azure-stream-binder-servicebus</module>
         <module>spring-cloud-azure-starter-stream-eventhubs</module>
-        <module>spring-cloud-azure-starter-stream-servicebus-queue</module>
-        <module>spring-cloud-azure-starter-stream-servicebus-topic</module>
+        <module>spring-cloud-azure-starter-stream-servicebus</module>
         <module>spring-cloud-azure-stream-binder-test</module>
       </modules>
     </profile>

sdk/spring/scripts/Update-DevOps-Release-WorkItem/Update-DevOps-Release-WorkItems-For-SpringCloud.ps1

@@ -18,10 +18,8 @@ $springtCloudReleaseVersion = "2.6.0"
 . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-eventhubs
 . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-eventhubs-core
 . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus-core
-. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus-queue
-. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-servicebus-queue
-. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus-topic
-. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-servicebus-topic
+. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus
+. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-servicebus
 . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-test
 . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-integration-core
 . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-integration-eventhubs

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/context/AzureContextUtils.java

@@ -10,22 +10,6 @@ public abstract class AzureContextUtils {
 
     public static final String DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME = "springDefaultAzureCredential";
 
-    public static final String SERVICE_BUS_CONSUMER_CLIENT_BUILDER_FACTORY_BEAN_NAME =
-        "SERVICE_BUS_CONSUMER_CLIENT_BUILDER_FACTORY_BEAN_NAME";
-    public static final String SERVICE_BUS_CONSUMER_CLIENT_BUILDER_BEAN_NAME =
-        "SERVICE_BUS_CONSUMER_CLIENT_BUILDER_BEAN_NAME";
-
-    public static final String SERVICE_BUS_PRODUCER_CLIENT_BUILDER_FACTORY_BEAN_NAME =
-        "SERVICE_BUS_PRODUCER_CLIENT_BUILDER_FACTORY_BEAN_NAME";
-    public static final String SERVICE_BUS_PRODUCER_CLIENT_BUILDER_BEAN_NAME =
-        "SERVICE_BUS_PRODUCER_CLIENT_BUILDER_BEAN_NAME";
-
-    public static final String SERVICE_BUS_PROCESSOR_CLIENT_BUILDER_FACTORY_BEAN_NAME =
-        "SERVICE_BUS_PROCESSOR_CLIENT_BUILDER_FACTORY_BEAN_NAME";
-    public static final String SERVICE_BUS_PROCESSOR_CLIENT_BUILDER_BEAN_NAME =
-        "SERVICE_BUS_PROCESSOR_CLIENT_BUILDER_BEAN_NAME";
-
-
     public static final String EVENT_HUB_CONSUMER_CLIENT_BUILDER_FACTORY_BEAN_NAME =
         "EVENT_HUB_CONSUMER_CLIENT_BUILDER_FACTORY_BEAN_NAME";
     public static final String EVENT_HUB_CONSUMER_CLIENT_BUILDER_BEAN_NAME =

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/messaging/AzureMessagingListenerAutoConfiguration.java

@@ -3,8 +3,8 @@
 
 package com.azure.spring.cloud.autoconfigure.messaging;
 
+import com.azure.spring.cloud.autoconfigure.servicebus.AzureServiceBusMessagingAutoConfiguration;
 import com.azure.spring.cloud.autoconfigure.eventhubs.AzureEventHubsMessagingAutoConfiguration;
-import com.azure.spring.cloud.autoconfigure.servicebus.AzureServiceBusTopicOperationAutoConfiguration;
 import com.azure.spring.messaging.annotation.EnableAzureMessaging;
 import com.azure.spring.messaging.config.AzureListenerAnnotationBeanPostProcessor;
 import com.azure.spring.messaging.container.DefaultAzureListenerContainerFactory;
@@ -25,7 +25,7 @@
 @ConditionalOnClass(EnableAzureMessaging.class)
 @AutoConfigureAfter({
     AzureEventHubsMessagingAutoConfiguration.class,
-    AzureServiceBusTopicOperationAutoConfiguration.class
+    AzureServiceBusMessagingAutoConfiguration.class
 })
 @ConditionalOnBean(SubscribeByGroupOperation.class)
 public class AzureMessagingListenerAutoConfiguration {

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/resourcemanager/AzureServiceBusResourceManagerAutoConfiguration.java

@@ -8,10 +8,8 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnMissingProperty;
 import com.azure.spring.cloud.autoconfigure.servicebus.properties.AzureServiceBusProperties;
 import com.azure.spring.cloud.resourcemanager.connectionstring.ServiceBusArmConnectionStringProvider;
-import com.azure.spring.servicebus.provisioning.ServiceBusQueueProvisioner;
-import com.azure.spring.servicebus.provisioning.ServiceBusTopicProvisioner;
-import com.azure.spring.servicebus.provisioning.arm.DefaultServiceBusQueueProvisioner;
-import com.azure.spring.servicebus.provisioning.arm.DefaultServiceBusTopicProvisioner;
+import com.azure.spring.servicebus.provisioning.ServiceBusProvisioner;
+import com.azure.spring.servicebus.provisioning.arm.DefaultServiceBusProvisioner;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -40,14 +38,8 @@ public AzureServiceBusResourceManagerAutoConfiguration(AzureResourceManager azur
 
     @Bean
     @ConditionalOnMissingBean
-    public ServiceBusQueueProvisioner serviceBusQueueProvisioner() {
-        return new DefaultServiceBusQueueProvisioner(this.azureResourceManager, this.serviceBusProperties.getResource());
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public ServiceBusTopicProvisioner serviceBusTopicProvisioner() {
-        return new DefaultServiceBusTopicProvisioner(this.azureResourceManager, this.serviceBusProperties.getResource());
+    public ServiceBusProvisioner serviceBusProvisioner() {
+        return new DefaultServiceBusProvisioner(this.azureResourceManager, this.serviceBusProperties.getResource());
     }
 
     @Bean

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/AzureServiceBusAutoConfiguration.java

@@ -22,7 +22,7 @@
     AzureServiceBusClientBuilderConfiguration.class,
     AzureServiceBusProducerClientConfiguration.class,
     AzureServiceBusConsumerClientConfiguration.class,
-    AzureServiceBusProcessorConfiguration.class
+    AzureServiceBusProcessorClientConfiguration.class
 })
 public class AzureServiceBusAutoConfiguration extends AzureServiceConfigurationBase {