Lower the priority of the EntityType used by ServiceBusTemplate

sdk/spring/CHANGELOG.md

@@ -1,20 +1,12 @@
 # Release History
-# (Unreleased)
-Upgrade Spring Boot dependencies version to 3.4.4 and Spring Cloud dependencies version to 2024.0.1
 
-## 5.22.0-beta.1 (Unreleased)
-
-### Spring Cloud Azure Autoconfigure
-This section includes changes in `spring-cloud-azure-autoconfigure` module.
-
-#### Features Added
-- Register a new bean `ServiceBusConsumerFactory` to support request-reply pattern of `ServiceBusTemplate`.
+## 5.23.0-beta.1 (Unreleased)
 
 ### Spring Messaging Azure Service Bus
 This section includes changes in the `spring-messaging-azure-servicebus` module.
 
-#### Features Added
-- `ServiceBusTemplate` supports request-reply pattern.
+#### Bugs Fixed
+- Lower the priority of the `EntityType` used by `ServiceBusTemplate`.
 
 ## 5.22.0 (2025-04-08)
 - This release is compatible with Spring Boot 3.4.0-3.4.4, 3.3.0-3.3.10, 3.2.0-3.2.12, 3.1.0-3.1.12, 3.0.0-3.0.13. (Note: 3.4.x (x>4), 3.3.y (y>10) and 3.2.z (z>12) should be supported, but they aren't tested with this release.)

sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java

@@ -80,7 +80,7 @@ public ServiceBusSessionReceiverClient createReceiver(String name) {
     public ServiceBusSessionReceiverClient createReceiver(String name, ServiceBusEntityType entityType) {
         ConsumerProperties consumerProperties = this.propertiesSupplier.getProperties(new ConsumerIdentifier(name)) != null
             ? this.propertiesSupplier.getProperties(new ConsumerIdentifier(name)) : new ConsumerProperties();
-        if (entityType != null) {
+        if (consumerProperties.getEntityType() == null && entityType != null) {
             consumerProperties.setEntityType(entityType);
         }
         return doCreateReceiver(name, consumerProperties);

sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProducerFactory.java

@@ -78,7 +78,7 @@ public ServiceBusSenderAsyncClient createProducer(String name) {
     public ServiceBusSenderAsyncClient createProducer(String name, ServiceBusEntityType entityType) {
         ProducerProperties producerProperties = this.propertiesSupplier.getProperties(name) != null
             ? this.propertiesSupplier.getProperties(name) : new ProducerProperties();
-        if (entityType != null) {
+        if (producerProperties.getEntityType() == null && entityType != null) {
             producerProperties.setEntityType(entityType);
         }
         return doCreateProducer(name, producerProperties);

sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/ServiceBusTemplate.java

@@ -157,7 +157,7 @@ public <U> ServiceBusReceivedMessage sendAndReceive(String destination,
             LOGGER.debug("Provided reply-to session id ‘{}’ for entity '{}', it should be unique.", replyToSessionId, destination);
         }
 
-        ServiceBusSenderAsyncClient senderAsyncClient = this.producerFactory.createProducer(destination, defaultEntityType);
+        ServiceBusSenderAsyncClient senderAsyncClient = this.producerFactory.createProducer(destination, currentEntityType);
         senderAsyncClient.sendMessage(serviceBusMessage).block(sendTimeout);
 
         ServiceBusSessionReceiverClient sessionReceiver = consumerFactory.createReceiver(replyDestination, currentEntityType);