Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- Fixed `ServiceBusAdministrationClient.updateSubscription()` silently ignoring `defaultMessageTimeToLive` changes. The property was incorrectly nullified before serialization. ([#48495](https://github.com/Azure/azure-sdk-for-java/issues/48495))

### Other Changes

## 7.17.17 (2026-01-29)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ CreateSubscriptionBody getUpdateSubscriptionBody(SubscriptionProperties subscrip
// properly update fields if it encounters MessageCountDetails in the serialized XML. Mirrors behaviour in
// Track 1 library.
final SubscriptionDescription implementation = EntityHelper.toImplementation(subscription)
.setDefaultMessageTimeToLive(null)
.setMessageCount(null)
.setCreatedAt(null)
.setUpdatedAt(null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.SimpleResponse;
import com.azure.core.util.Context;
import com.azure.core.util.logging.ClientLogger;
import com.azure.messaging.servicebus.administration.implementation.EntitiesImpl;
import com.azure.messaging.servicebus.administration.implementation.EntityHelper;
import com.azure.messaging.servicebus.administration.implementation.RulesImpl;
import com.azure.messaging.servicebus.administration.implementation.ServiceBusManagementClientImpl;
import com.azure.messaging.servicebus.administration.implementation.ServiceBusManagementSerializer;
import com.azure.messaging.servicebus.administration.implementation.SubscriptionsImpl;
import com.azure.messaging.servicebus.administration.implementation.models.CreateQueueBody;
import com.azure.messaging.servicebus.administration.implementation.models.CreateSubscriptionBody;
import com.azure.messaging.servicebus.administration.implementation.models.MessageCountDetails;
import com.azure.messaging.servicebus.administration.implementation.models.SubscriptionDescription;
import com.azure.messaging.servicebus.administration.implementation.models.QueueDescription;
import com.azure.messaging.servicebus.administration.implementation.models.QueueDescriptionEntry;
import com.azure.messaging.servicebus.administration.implementation.models.QueueDescriptionEntryContent;
Expand All @@ -32,6 +35,7 @@
import com.azure.messaging.servicebus.administration.models.CreateQueueOptions;
import com.azure.messaging.servicebus.administration.models.QueueProperties;
import com.azure.messaging.servicebus.administration.models.QueueRuntimeProperties;
import com.azure.messaging.servicebus.administration.models.SubscriptionProperties;
import io.netty.handler.codec.http.HttpResponseStatus;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -41,6 +45,7 @@
import org.mockito.MockitoAnnotations;

import java.io.IOException;
import java.time.Duration;
import java.time.OffsetDateTime;
import java.util.Arrays;
import java.util.List;
Expand All @@ -56,6 +61,7 @@
import static com.azure.messaging.servicebus.implementation.ServiceBusConstants.SERVICE_BUS_SUPPLEMENTARY_AUTHORIZATION_HEADER_NAME;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
Expand Down Expand Up @@ -556,4 +562,38 @@ void deleteTopicWithResponse() {
// Assert
assertEquals(actual.getStatusCode(), HttpResponseStatus.NO_CONTENT.code());
}

/**
* Verifies that {@link AdministrationModelConverter#getUpdateSubscriptionBody} preserves the
* {@code defaultMessageTimeToLive} value instead of nullifying it. Regression test for
* <a href="https://github.com/Azure/azure-sdk-for-java/issues/48495">#48495</a>.
*/
@Test
void updateSubscriptionPreservesDefaultMessageTimeToLive() {
// Arrange
final Duration expectedTtl = Duration.ofSeconds(50000);
final SubscriptionDescription description
= new SubscriptionDescription().setLockDuration(Duration.ofSeconds(30))
.setDefaultMessageTimeToLive(expectedTtl)
.setMaxDeliveryCount(10)
.setEnableBatchedOperations(true);

final SubscriptionProperties properties = EntityHelper.toModel(description);
EntityHelper.setTopicName(properties, topicName);
EntityHelper.setSubscriptionName(properties, subscriptionName);

final AdministrationModelConverter converter = new AdministrationModelConverter(
new ClientLogger(ServiceBusAdministrationClientTest.class), "endpoint.servicebus.foo");

// Act
final CreateSubscriptionBody body = converter.getUpdateSubscriptionBody(properties, Context.NONE);

// Assert
assertNotNull(body.getContent());
assertNotNull(body.getContent().getSubscriptionDescription());

final SubscriptionDescription result = body.getContent().getSubscriptionDescription();
assertEquals(expectedTtl, result.getDefaultMessageTimeToLive(),
"defaultMessageTimeToLive should be preserved in the update body");
}
}
Loading