From b547dd36d7e12ed824e0cd4d6c54d8de52f81eef Mon Sep 17 00:00:00 2001 From: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com> Date: Thu, 29 Oct 2020 14:57:31 -0700 Subject: [PATCH] [Service Bus] Change getter of boolean values to isXyz() (#15890) --- .../models/CreateQueueOptions.java | 32 +++++------ .../models/CreateSubscriptionOptions.java | 24 ++++---- .../models/CreateTopicOptions.java | 32 +++++------ .../models/QueueProperties.java | 22 ++++---- .../administration/models/RuleProperties.java | 4 +- .../administration/models/SqlRuleAction.java | 2 +- .../administration/models/SqlRuleFilter.java | 2 +- .../models/SubscriptionProperties.java | 16 +++--- .../models/TopicProperties.java | 16 +++--- .../implementation/EntityHelper.java | 24 ++++---- ...inistrationAsyncClientIntegrationTest.java | 56 +++++++++---------- ...rviceBusAdministrationAsyncClientTest.java | 10 ++-- .../models/CreateQueueOptionsTest.java | 28 +++++----- .../models/CreateSubscriptionOptionsTest.java | 12 ++-- .../models/CreateTopicOptionsTest.java | 14 ++--- .../implementation/EntityHelperTest.java | 36 ++++++------ .../ServiceBusManagementSerializerTest.java | 40 ++++++------- 17 files changed, 185 insertions(+), 185 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java index 8ff0c24c1546f..fa795849fdd1f 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java @@ -53,12 +53,12 @@ public class CreateQueueOptions { *
  • {@link #setDefaultMessageTimeToLive(Duration)} is max duration value.
    • *
  • {@link #setDuplicateDetectionHistoryTimeWindow(Duration)} is max duration value, but duplication * detection is disabled.
    • - *
  • {@link #setRequiresDuplicateDetection(boolean)} is false.
    • - *
  • {@link #setEnableBatchedOperations(boolean)} is true.
    • + *
  • {@link #setDuplicateDetectionRequired(boolean)} is false.
    • + *
  • {@link #setBatchedOperationsEnabled(boolean)} is true.
    • *
  • {@link #setLockDuration(Duration)} is 1 minute.
    • *
  • {@link #setMaxDeliveryCount(int)} is 10.
    • *
  • {@link #setMaxSizeInMegabytes(int)} is 1024MB.
    • - *
  • {@link #setRequiresSession(boolean)} is false.
    • + *
  • {@link #setSessionRequired(boolean)} is false.
    • *
  • {@link #setStatus(EntityStatus)} is {@link EntityStatus#ACTIVE}.
    • * * @@ -98,16 +98,16 @@ public CreateQueueOptions(QueueProperties queue) { this.duplicateDetectionHistoryTimeWindow = queue.getDuplicateDetectionHistoryTimeWindow() != null ? queue.getDuplicateDetectionHistoryTimeWindow() : DEFAULT_DUPLICATE_DETECTION_DURATION; - this.enableBatchedOperations = queue.enableBatchedOperations(); - this.enablePartitioning = queue.enablePartitioning(); + this.enableBatchedOperations = queue.isBatchedOperationsEnabled(); + this.enablePartitioning = queue.isPartitioningEnabled(); this.forwardTo = queue.getForwardTo(); this.forwardDeadLetteredMessagesTo = queue.getForwardDeadLetteredMessagesTo(); this.lockDuration = queue.getLockDuration(); this.maxDeliveryCount = queue.getMaxDeliveryCount(); this.maxSizeInMegabytes = queue.getMaxSizeInMegabytes(); - this.requiresDuplicateDetection = queue.requiresDuplicateDetection(); - this.requiresSession = queue.requiresSession(); + this.requiresDuplicateDetection = queue.isDuplicateDetectionRequired(); + this.requiresSession = queue.isSessionRequired(); this.status = queue.getStatus(); this.userMetadata = queue.getUserMetadata(); } @@ -175,7 +175,7 @@ public CreateQueueOptions setDefaultMessageTimeToLive(Duration defaultMessageTim * * @return the deadLetteringOnMessageExpiration value. */ - public boolean deadLetteringOnMessageExpiration() { + public boolean isDeadLetteringOnMessageExpiration() { return this.deadLetteringOnMessageExpiration; } @@ -221,7 +221,7 @@ public CreateQueueOptions setDuplicateDetectionHistoryTimeWindow(Duration duplic * * @return the enableBatchedOperations value. */ - public boolean enableBatchedOperations() { + public boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -233,7 +233,7 @@ public boolean enableBatchedOperations() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setEnableBatchedOperations(boolean enableBatchedOperations) { + public CreateQueueOptions setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } @@ -244,7 +244,7 @@ public CreateQueueOptions setEnableBatchedOperations(boolean enableBatchedOperat * * @return the enablePartitioning value. */ - public boolean enablePartitioning() { + public boolean isPartitioningEnabled() { return this.enablePartitioning; } @@ -256,7 +256,7 @@ public boolean enablePartitioning() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setEnablePartitioning(boolean enablePartitioning) { + public CreateQueueOptions setPartitioningEnabled(boolean enablePartitioning) { this.enablePartitioning = enablePartitioning; return this; } @@ -383,7 +383,7 @@ public CreateQueueOptions setMaxSizeInMegabytes(int maxSizeInMegabytes) { * * @return the requiresDuplicateDetection value. */ - public boolean requiresDuplicateDetection() { + public boolean isDuplicateDetectionRequired() { return this.requiresDuplicateDetection; } @@ -394,7 +394,7 @@ public boolean requiresDuplicateDetection() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setRequiresDuplicateDetection(boolean requiresDuplicateDetection) { + public CreateQueueOptions setDuplicateDetectionRequired(boolean requiresDuplicateDetection) { this.requiresDuplicateDetection = requiresDuplicateDetection; return this; } @@ -404,7 +404,7 @@ public CreateQueueOptions setRequiresDuplicateDetection(boolean requiresDuplicat * * @return the requiresSession value. */ - public boolean requiresSession() { + public boolean isSessionRequired() { return this.requiresSession; } @@ -415,7 +415,7 @@ public boolean requiresSession() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setRequiresSession(boolean requiresSession) { + public CreateQueueOptions setSessionRequired(boolean requiresSession) { this.requiresSession = requiresSession; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java index 367bde1913a14..0a9431066cbef 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java @@ -42,11 +42,11 @@ public class CreateSubscriptionOptions { *
  • {@link #setAutoDeleteOnIdle(Duration)} is max duration value.
    • *
  • {@link #setDeadLetteringOnMessageExpiration(boolean)} is false.
    • *
  • {@link #setDefaultMessageTimeToLive(Duration)} is max duration value.
    • - *
  • {@link #setEnableBatchedOperations(boolean)} is true.
    • + *
  • {@link #setBatchedOperationsEnabled(boolean)} is true.
    • *
  • {@link #setEnableDeadLetteringOnFilterEvaluationExceptions(boolean)} is true.
    • *
  • {@link #setLockDuration(Duration)} is 1 minute.
    • *
  • {@link #setMaxDeliveryCount(int)} is 10.
    • - *
  • {@link #setRequiresSession(boolean)} is false.
    • + *
  • {@link #setSessionRequired(boolean)} is false.
    • *
  • {@link #setStatus(EntityStatus)} is {@link EntityStatus#ACTIVE}.
    • * * @@ -76,15 +76,15 @@ public CreateSubscriptionOptions(SubscriptionProperties subscription) { Objects.requireNonNull(subscription, "'subscription' cannot be null."); this.autoDeleteOnIdle = subscription.getAutoDeleteOnIdle(); - this.deadLetteringOnMessageExpiration = subscription.deadLetteringOnMessageExpiration(); - this.deadLetteringOnFilterEvaluationExceptions = subscription.enableDeadLetteringOnFilterEvaluationExceptions(); + this.deadLetteringOnMessageExpiration = subscription.isDeadLetteringOnMessageExpiration(); + this.deadLetteringOnFilterEvaluationExceptions = subscription.isDeadLetteringOnFilterEvaluationExceptions(); this.defaultMessageTimeToLive = subscription.getDefaultMessageTimeToLive(); - this.enableBatchedOperations = subscription.enableBatchedOperations(); + this.enableBatchedOperations = subscription.isBatchedOperationsEnabled(); this.forwardTo = subscription.getForwardTo(); this.forwardDeadLetteredMessagesTo = subscription.getForwardDeadLetteredMessagesTo(); this.lockDuration = subscription.getLockDuration(); this.maxDeliveryCount = subscription.getMaxDeliveryCount(); - this.requiresSession = subscription.requiresSession(); + this.requiresSession = subscription.isSessionRequired(); this.status = subscription.getStatus(); this.userMetadata = subscription.getUserMetadata(); } @@ -119,7 +119,7 @@ public CreateSubscriptionOptions setLockDuration(Duration lockDuration) { * * @return the requiresSession value. */ - public boolean requiresSession() { + public boolean isSessionRequired() { return this.requiresSession; } @@ -130,7 +130,7 @@ public boolean requiresSession() { * * @return the CreateSubscriptionOptions object itself. */ - public CreateSubscriptionOptions setRequiresSession(boolean requiresSession) { + public CreateSubscriptionOptions setSessionRequired(boolean requiresSession) { this.requiresSession = requiresSession; return this; } @@ -166,7 +166,7 @@ public CreateSubscriptionOptions setDefaultMessageTimeToLive(Duration defaultMes * * @return the deadLetteringOnMessageExpiration value. */ - public boolean deadLetteringOnMessageExpiration() { + public boolean isDeadLetteringOnMessageExpiration() { return this.deadLetteringOnMessageExpiration; } @@ -189,7 +189,7 @@ public CreateSubscriptionOptions setDeadLetteringOnMessageExpiration(boolean dea * * @return the deadLetteringOnFilterEvaluationExceptions value. */ - public boolean enableDeadLetteringOnFilterEvaluationExceptions() { + public boolean isDeadLetteringOnFilterEvaluationExceptions() { return this.deadLetteringOnFilterEvaluationExceptions; } @@ -236,7 +236,7 @@ public CreateSubscriptionOptions setMaxDeliveryCount(int maxDeliveryCount) { * * @return the enableBatchedOperations value. */ - public boolean enableBatchedOperations() { + public boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -248,7 +248,7 @@ public boolean enableBatchedOperations() { * * @return the CreateSubscriptionOptions object itself. */ - public CreateSubscriptionOptions setEnableBatchedOperations(boolean enableBatchedOperations) { + public CreateSubscriptionOptions setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java index bb5fbbe7cb5ed..d5e6277bf8e99 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java @@ -49,12 +49,12 @@ public class CreateTopicOptions { *
  • {@link #setDefaultMessageTimeToLive(Duration)} is max duration value.
    • *
  • {@link #setDuplicateDetectionHistoryTimeWindow(Duration)} is max duration value, but duplication * detection is disabled.
    • - *
  • {@link #setRequiresDuplicateDetection(boolean)} is false.
    • - *
  • {@link #setEnableBatchedOperations(boolean)} is true.
    • + *
  • {@link #setDuplicateDetectionRequired(boolean)} is false.
    • + *
  • {@link #setBatchedOperationsEnabled(boolean)} (boolean)} is true.
    • *
  • {@link #setLockDuration(Duration)} is 1 minute.
    • *
  • {@link #setMaxDeliveryCount(int)} is 10.
    • *
  • {@link #setMaxSizeInMegabytes(long)} is 1024MB.
    • - *
  • {@link #setRequiresSession(boolean)} is false.
    • + *
  • {@link #setSessionRequired(boolean)} is false.
    • *
  • {@link #setStatus(EntityStatus)} is {@link EntityStatus#ACTIVE}.
    • * * @@ -89,11 +89,11 @@ public CreateTopicOptions(TopicProperties topic) { this.autoDeleteOnIdle = topic.getAutoDeleteOnIdle(); this.defaultMessageTimeToLive = topic.getDefaultMessageTimeToLive(); this.duplicateDetectionHistoryTimeWindow = topic.getDuplicateDetectionHistoryTimeWindow(); - this.enableBatchedOperations = topic.enableBatchedOperations(); - this.enablePartitioning = topic.enablePartitioning(); + this.enableBatchedOperations = topic.isBatchedOperationsEnabled(); + this.enablePartitioning = topic.isPartitioningEnabled(); this.maxSizeInMegabytes = topic.getMaxSizeInMegabytes(); - this.requiresDuplicateDetection = topic.requiresDuplicateDetection(); - this.supportOrdering = topic.supportOrdering(); + this.requiresDuplicateDetection = topic.isDuplicateDetectionRequired(); + this.supportOrdering = topic.isOrderingSupported(); this.status = topic.getStatus(); this.userMetadata = topic.getUserMetadata(); } @@ -184,7 +184,7 @@ public CreateTopicOptions setDuplicateDetectionHistoryTimeWindow(Duration duplic * * @return the enableBatchedOperations value. */ - public Boolean enableBatchedOperations() { + public Boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -196,7 +196,7 @@ public Boolean enableBatchedOperations() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setEnableBatchedOperations(boolean enableBatchedOperations) { + public CreateTopicOptions setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } @@ -207,7 +207,7 @@ public CreateTopicOptions setEnableBatchedOperations(boolean enableBatchedOperat * * @return the enablePartitioning value. */ - public Boolean enablePartitioning() { + public Boolean isPartitioningEnabled() { return this.enablePartitioning; } @@ -219,7 +219,7 @@ public Boolean enablePartitioning() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setEnablePartitioning(boolean enablePartitioning) { + public CreateTopicOptions setPartitioningEnabled(boolean enablePartitioning) { this.enablePartitioning = enablePartitioning; return this; } @@ -263,7 +263,7 @@ public boolean isSupportOrdering() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setSupportOrdering(boolean supportOrdering) { + public CreateTopicOptions setOrderingSupported(boolean supportOrdering) { this.supportOrdering = supportOrdering; return this; } @@ -344,7 +344,7 @@ public CreateTopicOptions setMaxSizeInMegabytes(long maxSizeInMegabytes) { * * @return the requiresDuplicateDetection value. */ - public Boolean requiresDuplicateDetection() { + public Boolean isDuplicateDetectionRequired() { return this.requiresDuplicateDetection; } @@ -355,7 +355,7 @@ public Boolean requiresDuplicateDetection() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setRequiresDuplicateDetection(boolean requiresDuplicateDetection) { + public CreateTopicOptions setDuplicateDetectionRequired(boolean requiresDuplicateDetection) { this.requiresDuplicateDetection = requiresDuplicateDetection; return this; } @@ -365,7 +365,7 @@ public CreateTopicOptions setRequiresDuplicateDetection(boolean requiresDuplicat * * @return the requiresSession value. */ - public Boolean requiresSession() { + public Boolean isSessionRequired() { return this.requiresSession; } @@ -376,7 +376,7 @@ public Boolean requiresSession() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setRequiresSession(boolean requiresSession) { + public CreateTopicOptions setSessionRequired(boolean requiresSession) { this.requiresSession = requiresSession; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java index b17363f080961..eaf9f7911464e 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java @@ -64,7 +64,7 @@ public QueueDescription toImplementation(QueueProperties queue, List parameters = action.getProperties().entrySet().stream() @@ -183,7 +183,7 @@ public RuleFilterImpl toImplementation(RuleFilter model) { final SqlFilterImpl returned = new SqlFilterImpl() .setSqlExpression(filter.getSqlExpression()) .setCompatibilityLevel(filter.getCompatibilityLevel()) - .setRequiresPreprocessing(filter.getRequiresPreprocessing()); + .setRequiresPreprocessing(filter.isPreprocessingRequired()); if (!filter.getProperties().isEmpty()) { final List parameters = filter.getProperties().entrySet() diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java index ecfe30598dab4..be01a3323f1d9 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java @@ -69,7 +69,7 @@ String getCompatibilityLevel() { * * @return Whether or not requires preprocessing. */ - Boolean getRequiresPreprocessing() { + Boolean isPreprocessingRequired() { return requiresPreprocessing; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java index 32630779325c0..87ebd5f6b1622 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java @@ -75,7 +75,7 @@ String getCompatibilityLevel() { * * @return Whether or not requires preprocessing. */ - Boolean getRequiresPreprocessing() { + Boolean isPreprocessingRequired() { return requiresPreprocessing; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java index 7410ca1affef7..e02c203126130 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java @@ -53,8 +53,8 @@ public SubscriptionDescription toImplementation(SubscriptionProperties subscript .setAutoDeleteOnIdle(subscription.getAutoDeleteOnIdle()) .setCreatedAt(subscription.getCreatedAt()) .setDeadLetteringOnFilterEvaluationExceptions( - subscription.enableDeadLetteringOnFilterEvaluationExceptions()) - .setDeadLetteringOnMessageExpiration(subscription.deadLetteringOnMessageExpiration()) + subscription.isDeadLetteringOnFilterEvaluationExceptions()) + .setDeadLetteringOnMessageExpiration(subscription.isDeadLetteringOnMessageExpiration()) .setDefaultMessageTimeToLive(subscription.getDefaultMessageTimeToLive()) .setEnableBatchedOperations(subscription.enableBatchedOperations) .setEntityAvailabilityStatus(subscription.entityAvailabilityStatus) @@ -65,7 +65,7 @@ public SubscriptionDescription toImplementation(SubscriptionProperties subscript .setMessageCount(subscription.messageCount) .setMessageCountDetails(subscription.getMessageCountDetails()) .setStatus(subscription.getStatus()) - .setRequiresSession(subscription.requiresSession()) + .setRequiresSession(subscription.isSessionRequired()) .setUpdatedAt(subscription.getUpdatedAt()) .setUserMetadata(subscription.getUserMetadata()); } @@ -181,7 +181,7 @@ public SubscriptionProperties setLockDuration(Duration lockDuration) { * * @return the requiresSession value. */ - public boolean requiresSession() { + public boolean isSessionRequired() { return this.requiresSession; } @@ -215,7 +215,7 @@ public SubscriptionProperties setDefaultMessageTimeToLive(Duration defaultMessag * * @return the deadLetteringOnMessageExpiration value. */ - public boolean deadLetteringOnMessageExpiration() { + public boolean isDeadLetteringOnMessageExpiration() { return this.deadLetteringOnMessageExpiration; } @@ -237,7 +237,7 @@ public SubscriptionProperties setDeadLetteringOnMessageExpiration(boolean deadLe * * @return the deadLetteringOnFilterEvaluationExceptions value. */ - public boolean enableDeadLetteringOnFilterEvaluationExceptions() { + public boolean isDeadLetteringOnFilterEvaluationExceptions() { return this.deadLetteringOnFilterEvaluationExceptions; } @@ -302,7 +302,7 @@ public SubscriptionProperties setMaxDeliveryCount(int maxDeliveryCount) { * * @return the enableBatchedOperations value. */ - public boolean enableBatchedOperations() { + public boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -313,7 +313,7 @@ public boolean enableBatchedOperations() { * @param enableBatchedOperations the enableBatchedOperations value to set. * @return the SubscriptionProperties object itself. */ - public SubscriptionProperties setEnableBatchedOperations(boolean enableBatchedOperations) { + public SubscriptionProperties setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java index 9e77f77af6d1c..029ecc951aa39 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java @@ -63,7 +63,7 @@ public TopicDescription toImplementation(TopicProperties topic, List { assertEquals(queueName, queueDescription.getName()); - assertFalse(queueDescription.enablePartitioning()); - assertFalse(queueDescription.requiresSession()); + assertFalse(queueDescription.isPartitioningEnabled()); + assertFalse(queueDescription.isSessionRequired()); assertNotNull(queueDescription.getLockDuration()); final QueueRuntimeProperties runtimeProperties = new QueueRuntimeProperties(queueDescription); @@ -467,7 +467,7 @@ void getSubscription(HttpClient httpClient) { assertEquals(topicName, description.getTopicName()); assertEquals(subscriptionName, description.getSubscriptionName()); - assertTrue(description.requiresSession()); + assertTrue(description.isSessionRequired()); assertNotNull(description.getLockDuration()); final SubscriptionRuntimeProperties runtimeProperties = new SubscriptionRuntimeProperties(description); @@ -569,11 +569,11 @@ void getTopic(HttpClient httpClient) { .assertNext(topicDescription -> { assertEquals(topicName, topicDescription.getName()); - assertTrue(topicDescription.enableBatchedOperations()); - assertFalse(topicDescription.requiresDuplicateDetection()); + assertTrue(topicDescription.isBatchedOperationsEnabled()); + assertFalse(topicDescription.isDuplicateDetectionRequired()); assertNotNull(topicDescription.getDuplicateDetectionHistoryTimeWindow()); assertNotNull(topicDescription.getDefaultMessageTimeToLive()); - assertFalse(topicDescription.enablePartitioning()); + assertFalse(topicDescription.isPartitioningEnabled()); final TopicRuntimeProperties runtimeProperties = new TopicRuntimeProperties(topicDescription); assertNotNull(runtimeProperties.getCreatedAt()); @@ -703,9 +703,9 @@ void listQueues(HttpClient httpClient) { StepVerifier.create(client.listQueues()) .assertNext(queueDescription -> { assertNotNull(queueDescription.getName()); - assertTrue(queueDescription.enableBatchedOperations()); - assertFalse(queueDescription.requiresDuplicateDetection()); - assertFalse(queueDescription.enablePartitioning()); + assertTrue(queueDescription.isBatchedOperationsEnabled()); + assertFalse(queueDescription.isDuplicateDetectionRequired()); + assertFalse(queueDescription.isPartitioningEnabled()); }) .expectNextCount(9) .thenCancel() @@ -742,8 +742,8 @@ void listTopics(HttpClient httpClient) { StepVerifier.create(client.listTopics()) .assertNext(topics -> { assertNotNull(topics.getName()); - assertTrue(topics.enableBatchedOperations()); - assertFalse(topics.enablePartitioning()); + assertTrue(topics.isBatchedOperationsEnabled()); + assertFalse(topics.isPartitioningEnabled()); }) .expectNextCount(2) .thenCancel() diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java index 47318c3306701..413c7a08d0873 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java @@ -505,18 +505,18 @@ private static boolean createBodyContentEquals(Object requestBody, CreateQueueOp return equals(expected.getAutoDeleteOnIdle(), properties.getAutoDeleteOnIdle()) && equals(expected.getDefaultMessageTimeToLive(), properties.getDefaultMessageTimeToLive()) - && equals(expected.deadLetteringOnMessageExpiration(), properties.isDeadLetteringOnMessageExpiration()) + && equals(expected.isDeadLetteringOnMessageExpiration(), properties.isDeadLetteringOnMessageExpiration()) && equals(expected.getDuplicateDetectionHistoryTimeWindow(), properties.getDuplicateDetectionHistoryTimeWindow()) - && equals(expected.enableBatchedOperations(), properties.isEnableBatchedOperations()) - && equals(expected.enablePartitioning(), properties.isEnablePartitioning()) + && equals(expected.isBatchedOperationsEnabled(), properties.isEnableBatchedOperations()) + && equals(expected.isPartitioningEnabled(), properties.isEnablePartitioning()) && equals(expected.getForwardTo(), properties.getForwardTo()) && equals(expected.getForwardDeadLetteredMessagesTo(), properties.getForwardDeadLetteredMessagesTo()) && equals(expected.getLockDuration(), properties.getLockDuration()) && equals(expected.getMaxDeliveryCount(), properties.getMaxDeliveryCount()) && equals(expected.getMaxSizeInMegabytes(), properties.getMaxSizeInMegabytes()) - && equals(expected.requiresDuplicateDetection(), properties.isRequiresDuplicateDetection()) - && equals(expected.requiresSession(), properties.isRequiresSession()) + && equals(expected.isDuplicateDetectionRequired(), properties.isRequiresDuplicateDetection()) + && equals(expected.isSessionRequired(), properties.isRequiresSession()) && equals(expected.getUserMetadata(), properties.getUserMetadata()) && "application/xml".equals(content.getType()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java index 12b242757ad93..1e6c5c2d29767 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java @@ -38,14 +38,14 @@ void constructor() { assertEquals(MAX_DURATION, actual.getAutoDeleteOnIdle()); assertEquals(MAX_DURATION, actual.getDefaultMessageTimeToLive()); assertEquals(DEFAULT_DUPLICATE_DETECTION_DURATION, actual.getDuplicateDetectionHistoryTimeWindow()); - assertTrue(actual.enableBatchedOperations()); - assertFalse(actual.enablePartitioning()); + assertTrue(actual.isBatchedOperationsEnabled()); + assertFalse(actual.isPartitioningEnabled()); assertEquals(DEFAULT_LOCK_DURATION, actual.getLockDuration()); assertEquals(DEFAULT_MAX_DELIVERY_COUNT, actual.getMaxDeliveryCount()); assertEquals(DEFAULT_QUEUE_SIZE, actual.getMaxSizeInMegabytes()); - assertFalse(actual.requiresDuplicateDetection()); - assertFalse(actual.requiresSession()); - assertFalse(actual.deadLetteringOnMessageExpiration()); + assertFalse(actual.isDuplicateDetectionRequired()); + assertFalse(actual.isSessionRequired()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); assertNull(actual.getUserMetadata()); assertEquals(EntityStatus.ACTIVE, actual.getStatus()); } @@ -73,15 +73,15 @@ void constructorWithOptions() { .setAutoDeleteOnIdle(Duration.ofSeconds(15)) .setDefaultMessageTimeToLive(Duration.ofSeconds(50)) .setDuplicateDetectionHistoryTimeWindow(Duration.ofSeconds(13)) - .setEnableBatchedOperations(false) - .setEnablePartitioning(true) + .setBatchedOperationsEnabled(false) + .setPartitioningEnabled(true) .setForwardTo("Forward-To-This-Queue") .setForwardDeadLetteredMessagesTo("Dead-Lettered-Forward-To") .setLockDuration(Duration.ofSeconds(120)) .setMaxDeliveryCount(15) .setMaxSizeInMegabytes(2048) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setUserMetadata("Test-queue-Metadata") .setStatus(EntityStatus.DISABLED); @@ -98,17 +98,17 @@ void constructorWithOptions() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertFalse(actual.deadLetteringOnMessageExpiration()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.enableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.enablePartitioning()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isBatchedOperationsEnabled()); + assertEquals(expected.isPartitioningEnabled(), actual.isPartitioningEnabled()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresDuplicateDetection(), actual.requiresDuplicateDetection()); - assertEquals(expected.requiresSession(), actual.requiresSession()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isDuplicateDetectionRequired()); + assertEquals(expected.isSessionRequired(), actual.isSessionRequired()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java index 9ba69e6233ad7..6b5d12decefde 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java @@ -30,11 +30,11 @@ void constructor() { // Assert assertEquals(MAX_DURATION, actual.getAutoDeleteOnIdle()); assertEquals(MAX_DURATION, actual.getDefaultMessageTimeToLive()); - assertTrue(actual.enableBatchedOperations()); + assertTrue(actual.isBatchedOperationsEnabled()); assertEquals(DEFAULT_LOCK_DURATION, actual.getLockDuration()); assertEquals(DEFAULT_MAX_DELIVERY_COUNT, actual.getMaxDeliveryCount()); - assertFalse(actual.requiresSession()); - assertFalse(actual.deadLetteringOnMessageExpiration()); + assertFalse(actual.isSessionRequired()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); assertEquals(EntityStatus.ACTIVE, actual.getStatus()); assertNull(actual.getUserMetadata()); } @@ -62,13 +62,13 @@ void constructorWithOptions() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertFalse(actual.deadLetteringOnMessageExpiration()); - assertEquals(expected.enableBatchedOperations(), actual.enableBatchedOperations()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isBatchedOperationsEnabled()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresSession(), actual.requiresSession()); + assertEquals(expected.isSessionRequired(), actual.isSessionRequired()); assertEquals(expected.getStatus(), actual.getStatus()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java index 4e87a8eb80b56..e524be52eb11a 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java @@ -33,13 +33,13 @@ void constructor() { assertEquals(MAX_DURATION, actual.getAutoDeleteOnIdle()); assertEquals(MAX_DURATION, actual.getDefaultMessageTimeToLive()); assertEquals(DEFAULT_DUPLICATE_DETECTION_DURATION, actual.getDuplicateDetectionHistoryTimeWindow()); - assertTrue(actual.enableBatchedOperations()); - assertFalse(actual.enablePartitioning()); + assertTrue(actual.isBatchedOperationsEnabled()); + assertFalse(actual.isPartitioningEnabled()); assertEquals(DEFAULT_LOCK_DURATION, actual.getLockDuration()); assertEquals(DEFAULT_MAX_DELIVERY_COUNT, actual.getMaxDeliveryCount()); assertEquals(DEFAULT_TOPIC_SIZE, actual.getMaxSizeInMegabytes()); - assertFalse(actual.requiresDuplicateDetection()); - assertFalse(actual.requiresSession()); + assertFalse(actual.isDuplicateDetectionRequired()); + assertFalse(actual.isSessionRequired()); assertNull(actual.getUserMetadata()); assertEquals(EntityStatus.ACTIVE, actual.getStatus()); } @@ -68,9 +68,9 @@ void constructorWithOptions() { assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.enableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.enablePartitioning()); - assertEquals(expected.requiresDuplicateDetection(), actual.requiresDuplicateDetection()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isBatchedOperationsEnabled()); + assertEquals(expected.isPartitioningEnabled(), actual.isPartitioningEnabled()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isDuplicateDetectionRequired()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java index ebe5e571331b3..6cb2eda76868f 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java @@ -38,11 +38,11 @@ void createTopic() { assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.isEnablePartitioning()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); + assertEquals(expected.isPartitioningEnabled(), actual.isEnablePartitioning()); assertEquals(expected.getMaxSizeInMegabytes(), actual.getMaxSizeInMegabytes()); assertEquals(expected.getStatus(), actual.getStatus()); - assertEquals(expected.requiresDuplicateDetection(), actual.isRequiresDuplicateDetection()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isRequiresDuplicateDetection()); assertEquals(expected.isSupportOrdering(), actual.isSupportOrdering()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); } @@ -55,15 +55,15 @@ void createQueue() { .setDefaultMessageTimeToLive(Duration.ofSeconds(50)) .setDeadLetteringOnMessageExpiration(true) .setDuplicateDetectionHistoryTimeWindow(Duration.ofSeconds(13)) - .setEnableBatchedOperations(false) - .setEnablePartitioning(true) + .setBatchedOperationsEnabled(false) + .setPartitioningEnabled(true) .setForwardTo("Forward-To-This-Queue") .setForwardDeadLetteredMessagesTo("Dead-Lettered-Forward-To") .setLockDuration(Duration.ofSeconds(120)) .setMaxDeliveryCount(15) .setMaxSizeInMegabytes(2048) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setUserMetadata("Test-queue-Metadata") .setStatus(EntityStatus.DISABLED); @@ -73,16 +73,16 @@ void createQueue() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertEquals(expected.deadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isDeadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.isEnablePartitioning()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); + assertEquals(expected.isPartitioningEnabled(), actual.isEnablePartitioning()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresDuplicateDetection(), actual.isRequiresDuplicateDetection()); - assertEquals(expected.requiresSession(), actual.isRequiresSession()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isRequiresDuplicateDetection()); + assertEquals(expected.isSessionRequired(), actual.isRequiresSession()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); } @@ -122,12 +122,12 @@ void createSubscription() { .setDefaultMessageTimeToLive(Duration.ofSeconds(50)) .setDeadLetteringOnMessageExpiration(true) .setEnableDeadLetteringOnFilterEvaluationExceptions(true) - .setEnableBatchedOperations(false) + .setBatchedOperationsEnabled(false) .setForwardTo("Forward-To-This-Queue") .setForwardDeadLetteredMessagesTo("Dead-Lettered-Forward-To") .setLockDuration(Duration.ofSeconds(120)) .setMaxDeliveryCount(15) - .setRequiresSession(true) + .setSessionRequired(true) .setStatus(EntityStatus.RECEIVE_DISABLED) .setUserMetadata("Test-topic-Metadata"); @@ -137,15 +137,15 @@ void createSubscription() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertEquals(expected.deadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); - assertEquals(expected.enableDeadLetteringOnFilterEvaluationExceptions(), + assertEquals(expected.isDeadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); + assertEquals(expected.isDeadLetteringOnFilterEvaluationExceptions(), actual.isDeadLetteringOnFilterEvaluationExceptions()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresSession(), actual.isRequiresSession()); + assertEquals(expected.isSessionRequired(), actual.isRequiresSession()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java index 8254de69c8a3c..03f07b4f8a900 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java @@ -88,12 +88,12 @@ void deserializeCreateQueueDescription() throws IOException { .setDuplicateDetectionHistoryTimeWindow(null) .setLockDuration(Duration.ofMinutes(10)) .setMaxSizeInMegabytes(1028) - .setRequiresDuplicateDetection(false) - .setRequiresSession(true) + .setDuplicateDetectionRequired(false) + .setSessionRequired(true) .setDeadLetteringOnMessageExpiration(false) .setMaxDeliveryCount(5) - .setEnableBatchedOperations(true) - .setEnablePartitioning(false); + .setBatchedOperationsEnabled(true) + .setPartitioningEnabled(false); expected.getAuthorizationRules().add(rule); @@ -124,15 +124,15 @@ void deserializeQueueDescription() throws IOException { final CreateQueueOptions expected = new CreateQueueOptions() .setLockDuration(Duration.ofMinutes(5)) .setMaxSizeInMegabytes(1024) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setDefaultMessageTimeToLive(Duration.parse("PT3H20M10S")) .setDeadLetteringOnMessageExpiration(false) .setDuplicateDetectionHistoryTimeWindow(Duration.ofMinutes(10)) .setMaxDeliveryCount(10) - .setEnableBatchedOperations(true) + .setBatchedOperationsEnabled(true) .setAutoDeleteOnIdle(Duration.ofHours(5)) - .setEnablePartitioning(true); + .setPartitioningEnabled(true); // Act final QueueDescriptionEntry entry = serializer.deserialize(contents, QueueDescriptionEntry.class); @@ -204,15 +204,15 @@ void deserializeQueueDescriptionFeedPaged() throws IOException { final CreateQueueOptions options = new CreateQueueOptions() .setLockDuration(Duration.ofMinutes(10)) .setMaxSizeInMegabytes(102) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setDefaultMessageTimeToLive(Duration.ofSeconds(10)) .setDeadLetteringOnMessageExpiration(false) .setDuplicateDetectionHistoryTimeWindow(Duration.ofMinutes(10)) .setMaxDeliveryCount(10) - .setEnableBatchedOperations(true) + .setBatchedOperationsEnabled(true) .setAutoDeleteOnIdle(Duration.ofSeconds(5)) - .setEnablePartitioning(true); + .setPartitioningEnabled(true); final QueueDescription queueProperties = EntityHelper.getQueueDescription(options); final QueueDescriptionEntry entry1 = new QueueDescriptionEntry() @@ -368,7 +368,7 @@ void deserializeCreateSubscription() throws IOException { new CreateSubscriptionOptions() .setAutoDeleteOnIdle(Duration.parse("P10675199DT2H48M5.477S")) .setDefaultMessageTimeToLive(Duration.parse("P10675199DT2H48M5.477S")) - .setRequiresSession(false) + .setSessionRequired(false) .setLockDuration(Duration.ofSeconds(45)) .setMaxDeliveryCount(7)); @@ -446,12 +446,12 @@ void deserializeSubscriptionDescriptionFeed() throws IOException { .setAutoDeleteOnIdle(Duration.ofDays(1))); final SubscriptionDescription subscription2 = EntityHelper.getSubscriptionDescription( new CreateSubscriptionOptions() - .setRequiresSession(true) + .setSessionRequired(true) .setLockDuration(Duration.ofSeconds(15)) .setMaxDeliveryCount(5)); final SubscriptionDescription subscription3 = EntityHelper.getSubscriptionDescription( new CreateSubscriptionOptions() - .setRequiresSession(true) + .setSessionRequired(true) .setLockDuration(Duration.ofSeconds(15)) .setMaxDeliveryCount(5)); final List expectedDescriptions = Arrays.asList( @@ -732,16 +732,16 @@ private static void assertQueueEquals(CreateQueueOptions expected, EntityStatus assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxSizeInMegabytes(), actual.getMaxSizeInMegabytes()); - assertEquals(expected.requiresDuplicateDetection(), actual.isRequiresDuplicateDetection()); - assertEquals(expected.requiresSession(), actual.isRequiresSession()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isRequiresDuplicateDetection()); + assertEquals(expected.isSessionRequired(), actual.isRequiresSession()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertEquals(expected.deadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isDeadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); - assertEquals(expected.enablePartitioning(), actual.isEnablePartitioning()); + assertEquals(expected.isPartitioningEnabled(), actual.isEnablePartitioning()); assertEquals(expectedStatus, actual.getStatus()); }