Skip to content

Commit ab87efe

Browse files
connieyconniey
authored
Updating names to administration client. (#14318)
* Moving files to administration package. * Renaming client to AdministrationClient. * Updating module-info.java * Update checkstyle suppressions for classes.
1 parent a7c3acb commit ab87efe

File tree

45 files changed

+248
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+248
-223
lines changed

‎eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,9 @@
523523

524524
<!-- False positive as the methods are implemented in an anonymous class that is not exposed publicly. EntityHelper's
525525
accessor classes are not visible. -->
526-
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.models.QueueProperties.java"/>
527-
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.models.SubscriptionProperties.java"/>
528-
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.models.TopicProperties.java"/>
526+
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.QueueProperties.java"/>
527+
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.SubscriptionProperties.java"/>
528+
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.TopicProperties.java"/>
529529

530530
<!-- Suppress DigitalTwins for now -->
531531
<suppress checks="[a-zA-Z0-9]*" files="[/\\]azure-digitaltwins-core[/\\]src[/\\]"/>

‎sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import com.azure.core.util.IterableStream;
1616
import com.azure.core.util.logging.ClientLogger;
1717
import com.azure.messaging.servicebus.ServiceBusClientBuilder.ServiceBusSessionReceiverClientBuilder;
18+
import com.azure.messaging.servicebus.administration.models.DeadLetterOptions;
1819
import com.azure.messaging.servicebus.implementation.DispositionStatus;
1920
import com.azure.messaging.servicebus.implementation.LockContainer;
2021
import com.azure.messaging.servicebus.implementation.MessagingEntityType;
2122
import com.azure.messaging.servicebus.implementation.ServiceBusConnectionProcessor;
2223
import com.azure.messaging.servicebus.implementation.ServiceBusReceiveLink;
2324
import com.azure.messaging.servicebus.implementation.ServiceBusReceiveLinkProcessor;
24-
import com.azure.messaging.servicebus.models.DeadLetterOptions;
2525
import com.azure.messaging.servicebus.models.ReceiveMode;
2626
import reactor.core.publisher.BaseSubscriber;
2727
import reactor.core.publisher.Flux;

‎sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.azure.core.util.IterableStream;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.azure.messaging.servicebus.ServiceBusClientBuilder.ServiceBusReceiverClientBuilder;
10-
import com.azure.messaging.servicebus.models.DeadLetterOptions;
10+
import com.azure.messaging.servicebus.administration.models.DeadLetterOptions;
1111
import com.azure.messaging.servicebus.models.ReceiveMode;
1212
import reactor.core.publisher.Flux;
1313
import reactor.core.publisher.FluxSink;

‎sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusManagementAsyncClient.java renamed to ‎sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClient.java

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.messaging.servicebus;
4+
package com.azure.messaging.servicebus.administration;
55

66
import com.azure.core.annotation.ReturnType;
77
import com.azure.core.annotation.ServiceClient;
@@ -22,6 +22,16 @@
2222
import com.azure.core.util.Context;
2323
import com.azure.core.util.IterableStream;
2424
import com.azure.core.util.logging.ClientLogger;
25+
import com.azure.messaging.servicebus.administration.models.CreateQueueOptions;
26+
import com.azure.messaging.servicebus.administration.models.CreateSubscriptionOptions;
27+
import com.azure.messaging.servicebus.administration.models.CreateTopicOptions;
28+
import com.azure.messaging.servicebus.administration.models.NamespaceProperties;
29+
import com.azure.messaging.servicebus.administration.models.QueueProperties;
30+
import com.azure.messaging.servicebus.administration.models.QueueRuntimeInfo;
31+
import com.azure.messaging.servicebus.administration.models.SubscriptionProperties;
32+
import com.azure.messaging.servicebus.administration.models.SubscriptionRuntimeInfo;
33+
import com.azure.messaging.servicebus.administration.models.TopicProperties;
34+
import com.azure.messaging.servicebus.administration.models.TopicRuntimeInfo;
2535
import com.azure.messaging.servicebus.implementation.EntitiesImpl;
2636
import com.azure.messaging.servicebus.implementation.EntityHelper;
2737
import com.azure.messaging.servicebus.implementation.ServiceBusManagementClientImpl;
@@ -45,16 +55,6 @@
4555
import com.azure.messaging.servicebus.implementation.models.TopicDescription;
4656
import com.azure.messaging.servicebus.implementation.models.TopicDescriptionEntry;
4757
import com.azure.messaging.servicebus.implementation.models.TopicDescriptionFeed;
48-
import com.azure.messaging.servicebus.models.CreateQueueOptions;
49-
import com.azure.messaging.servicebus.models.CreateSubscriptionOptions;
50-
import com.azure.messaging.servicebus.models.CreateTopicOptions;
51-
import com.azure.messaging.servicebus.models.NamespaceProperties;
52-
import com.azure.messaging.servicebus.models.QueueProperties;
53-
import com.azure.messaging.servicebus.models.QueueRuntimeInfo;
54-
import com.azure.messaging.servicebus.models.SubscriptionProperties;
55-
import com.azure.messaging.servicebus.models.SubscriptionRuntimeInfo;
56-
import com.azure.messaging.servicebus.models.TopicProperties;
57-
import com.azure.messaging.servicebus.models.TopicRuntimeInfo;
5858
import reactor.core.publisher.Flux;
5959
import reactor.core.publisher.Mono;
6060

@@ -83,10 +83,10 @@
8383
/**
8484
* An <b>asynchronous</b> client for managing a Service Bus namespace.
8585
*
86-
* @see ServiceBusManagementClient ServiceBusManagementClient for a synchronous client.
86+
* @see ServiceBusAdministrationClient ServiceBusManagementClient for a synchronous client.
8787
*/
88-
@ServiceClient(builder = ServiceBusManagementClientBuilder.class, isAsync = true)
89-
public final class ServiceBusManagementAsyncClient {
88+
@ServiceClient(builder = ServiceBusAdministrationClientBuilder.class, isAsync = true)
89+
public final class ServiceBusAdministrationAsyncClient {
9090
// See https://docs.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers
9191
// for more information on Azure resource provider namespaces.
9292
private static final String SERVICE_BUS_TRACING_NAMESPACE_VALUE = "Microsoft.ServiceBus";
@@ -100,7 +100,7 @@ public final class ServiceBusManagementAsyncClient {
100100

101101
private final ServiceBusManagementClientImpl managementClient;
102102
private final EntitiesImpl entityClient;
103-
private final ClientLogger logger = new ClientLogger(ServiceBusManagementAsyncClient.class);
103+
private final ClientLogger logger = new ClientLogger(ServiceBusAdministrationAsyncClient.class);
104104
private final ServiceBusManagementSerializer serializer;
105105

106106
/**
@@ -109,7 +109,7 @@ public final class ServiceBusManagementAsyncClient {
109109
* @param managementClient Client to make management calls.
110110
* @param serializer Serializer to deserialize ATOM XML responses.
111111
*/
112-
ServiceBusManagementAsyncClient(ServiceBusManagementClientImpl managementClient,
112+
ServiceBusAdministrationAsyncClient(ServiceBusManagementClientImpl managementClient,
113113
ServiceBusManagementSerializer serializer) {
114114
this.managementClient = Objects.requireNonNull(managementClient, "'managementClient' cannot be null.");
115115
this.entityClient = managementClient.getEntities();
@@ -1127,7 +1127,7 @@ Mono<Response<QueueProperties>> createQueueWithResponse(String queueName, Create
11271127

11281128
try {
11291129
return entityClient.putWithResponseAsync(queueName, createEntity, null, withTracing)
1130-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1130+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
11311131
.map(this::deserializeQueue);
11321132
} catch (RuntimeException ex) {
11331133
return monoError(logger, ex);
@@ -1172,7 +1172,7 @@ Mono<Response<SubscriptionProperties>> createSubscriptionWithResponse(String top
11721172
try {
11731173
return managementClient.getSubscriptions().putWithResponseAsync(topicName, subscriptionName, createEntity,
11741174
null, withTracing)
1175-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1175+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
11761176
.map(response -> deserializeSubscription(topicName, response));
11771177
} catch (RuntimeException ex) {
11781178
return monoError(logger, ex);
@@ -1212,7 +1212,7 @@ Mono<Response<TopicProperties>> createTopicWithResponse(String topicName, Create
12121212

12131213
try {
12141214
return entityClient.putWithResponseAsync(topicName, createEntity, null, withTracing)
1215-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1215+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
12161216
.map(this::deserializeTopic);
12171217
} catch (RuntimeException ex) {
12181218
return monoError(logger, ex);
@@ -1240,7 +1240,7 @@ Mono<Response<Void>> deleteQueueWithResponse(String queueName, Context context)
12401240

12411241
try {
12421242
return entityClient.deleteWithResponseAsync(queueName, withTracing)
1243-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1243+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
12441244
.map(response -> {
12451245
return new SimpleResponse<>(response.getRequest(), response.getStatusCode(),
12461246
response.getHeaders(), null);
@@ -1277,7 +1277,7 @@ Mono<Response<Void>> deleteSubscriptionWithResponse(String topicName, String sub
12771277
try {
12781278
return managementClient.getSubscriptions().deleteWithResponseAsync(topicName, subscriptionName,
12791279
withTracing)
1280-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1280+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
12811281
.map(response -> new SimpleResponse<>(response.getRequest(), response.getStatusCode(),
12821282
response.getHeaders(), null));
12831283
} catch (RuntimeException ex) {
@@ -1306,7 +1306,7 @@ Mono<Response<Void>> deleteTopicWithResponse(String topicName, Context context)
13061306

13071307
try {
13081308
return entityClient.deleteWithResponseAsync(topicName, withTracing)
1309-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1309+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
13101310
.map(response -> new SimpleResponse<>(response.getRequest(), response.getStatusCode(),
13111311
response.getHeaders(), null));
13121312
} catch (RuntimeException ex) {
@@ -1361,7 +1361,7 @@ <T> Mono<Response<T>> getQueueWithResponse(String queueName, Context context,
13611361

13621362
try {
13631363
return entityClient.getWithResponseAsync(queueName, true, withTracing)
1364-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1364+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
13651365
.handle((response, sink) -> {
13661366
final Response<QueueProperties> deserialize = deserializeQueue(response);
13671367

@@ -1409,7 +1409,7 @@ <T> Mono<Response<T>> getSubscriptionWithResponse(String topicName, String subsc
14091409
try {
14101410
return managementClient.getSubscriptions().getWithResponseAsync(topicName, subscriptionName, true,
14111411
withTracing)
1412-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1412+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
14131413
.handle((response, sink) -> {
14141414
final Response<SubscriptionProperties> deserialize = deserializeSubscription(topicName, response);
14151415

@@ -1476,7 +1476,7 @@ <T> Mono<Response<T>> getTopicWithResponse(String topicName, Context context,
14761476

14771477
try {
14781478
return entityClient.getWithResponseAsync(topicName, true, withTracing)
1479-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1479+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
14801480
.handle((response, sink) -> {
14811481
final Response<TopicProperties> deserialize = deserializeTopic(response);
14821482

@@ -1644,7 +1644,7 @@ Mono<Response<QueueProperties>> updateQueueWithResponse(QueueProperties queue, C
16441644
try {
16451645
// If-Match == "*" to unconditionally update. This is in line with the existing client library behaviour.
16461646
return entityClient.putWithResponseAsync(queue.getName(), createEntity, "*", withTracing)
1647-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1647+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
16481648
.map(response -> deserializeQueue(response));
16491649
} catch (RuntimeException ex) {
16501650
return monoError(logger, ex);
@@ -1682,7 +1682,7 @@ Mono<Response<SubscriptionProperties>> updateSubscriptionWithResponse(Subscripti
16821682
// If-Match == "*" to unconditionally update. This is in line with the existing client library behaviour.
16831683
return managementClient.getSubscriptions().putWithResponseAsync(topicName, subscriptionName, createEntity,
16841684
"*", withTracing)
1685-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1685+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
16861686
.map(response -> deserializeSubscription(topicName, response));
16871687
} catch (RuntimeException ex) {
16881688
return monoError(logger, ex);
@@ -1716,7 +1716,7 @@ Mono<Response<TopicProperties>> updateTopicWithResponse(TopicProperties topic, C
17161716
try {
17171717
// If-Match == "*" to unconditionally update. This is in line with the existing client library behaviour.
17181718
return entityClient.putWithResponseAsync(topic.getName(), createEntity, "*", withTracing)
1719-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1719+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
17201720
.map(response -> deserializeTopic(response));
17211721
} catch (RuntimeException ex) {
17221722
return monoError(logger, ex);
@@ -1886,7 +1886,7 @@ private <TResult, TFeed> FeedPage<TResult> extractPage(Response<TFeed> response,
18861886
*/
18871887
private Mono<PagedResponse<QueueProperties>> listQueues(int skip, Context context) {
18881888
return managementClient.listEntitiesWithResponseAsync(QUEUES_ENTITY_TYPE, skip, NUMBER_OF_ELEMENTS, context)
1889-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1889+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
18901890
.flatMap(response -> {
18911891
final Response<QueueDescriptionFeed> feedResponse = deserialize(response, QueueDescriptionFeed.class);
18921892
final QueueDescriptionFeed feed = feedResponse.getValue();
@@ -1928,7 +1928,7 @@ private Mono<PagedResponse<QueueProperties>> listQueues(int skip, Context contex
19281928
private Mono<PagedResponse<SubscriptionProperties>> listSubscriptions(String topicName, int skip,
19291929
Context context) {
19301930
return managementClient.listSubscriptionsWithResponseAsync(topicName, skip, NUMBER_OF_ELEMENTS, context)
1931-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1931+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
19321932
.flatMap(response -> {
19331933
final Response<SubscriptionDescriptionFeed> feedResponse = deserialize(response,
19341934
SubscriptionDescriptionFeed.class);
@@ -1972,7 +1972,7 @@ private Mono<PagedResponse<SubscriptionProperties>> listSubscriptions(String top
19721972
*/
19731973
private Mono<PagedResponse<TopicProperties>> listTopics(int skip, Context context) {
19741974
return managementClient.listEntitiesWithResponseAsync(TOPICS_ENTITY_TYPE, skip, NUMBER_OF_ELEMENTS, context)
1975-
.onErrorMap(ServiceBusManagementAsyncClient::mapException)
1975+
.onErrorMap(ServiceBusAdministrationAsyncClient::mapException)
19761976
.flatMap(response -> {
19771977
final Response<TopicDescriptionFeed> feedResponse = deserialize(response, TopicDescriptionFeed.class);
19781978
final TopicDescriptionFeed feed = feedResponse.getValue();

‎sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusManagementClient.java renamed to ‎sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationClient.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.messaging.servicebus;
4+
package com.azure.messaging.servicebus.administration;
55

66
import com.azure.core.annotation.ReturnType;
77
import com.azure.core.annotation.ServiceClient;
@@ -14,16 +14,16 @@
1414
import com.azure.core.http.rest.PagedIterable;
1515
import com.azure.core.http.rest.Response;
1616
import com.azure.core.util.Context;
17-
import com.azure.messaging.servicebus.models.CreateQueueOptions;
18-
import com.azure.messaging.servicebus.models.CreateSubscriptionOptions;
19-
import com.azure.messaging.servicebus.models.CreateTopicOptions;
20-
import com.azure.messaging.servicebus.models.NamespaceProperties;
21-
import com.azure.messaging.servicebus.models.QueueProperties;
22-
import com.azure.messaging.servicebus.models.QueueRuntimeInfo;
23-
import com.azure.messaging.servicebus.models.SubscriptionProperties;
24-
import com.azure.messaging.servicebus.models.SubscriptionRuntimeInfo;
25-
import com.azure.messaging.servicebus.models.TopicProperties;
26-
import com.azure.messaging.servicebus.models.TopicRuntimeInfo;
17+
import com.azure.messaging.servicebus.administration.models.CreateQueueOptions;
18+
import com.azure.messaging.servicebus.administration.models.CreateSubscriptionOptions;
19+
import com.azure.messaging.servicebus.administration.models.CreateTopicOptions;
20+
import com.azure.messaging.servicebus.administration.models.NamespaceProperties;
21+
import com.azure.messaging.servicebus.administration.models.QueueProperties;
22+
import com.azure.messaging.servicebus.administration.models.QueueRuntimeInfo;
23+
import com.azure.messaging.servicebus.administration.models.SubscriptionProperties;
24+
import com.azure.messaging.servicebus.administration.models.SubscriptionRuntimeInfo;
25+
import com.azure.messaging.servicebus.administration.models.TopicProperties;
26+
import com.azure.messaging.servicebus.administration.models.TopicRuntimeInfo;
2727
import reactor.core.publisher.Mono;
2828

2929
import java.time.Duration;
@@ -33,18 +33,18 @@
3333
/**
3434
* A <b>synchronous</b> client for managing a Service Bus namespace.
3535
*
36-
* @see ServiceBusManagementAsyncClient ServiceBusManagementAsyncClient for an asynchronous client.
36+
* @see ServiceBusAdministrationAsyncClient ServiceBusManagementAsyncClient for an asynchronous client.
3737
*/
38-
@ServiceClient(builder = ServiceBusManagementClientBuilder.class)
39-
public final class ServiceBusManagementClient {
40-
private final ServiceBusManagementAsyncClient asyncClient;
38+
@ServiceClient(builder = ServiceBusAdministrationClientBuilder.class)
39+
public final class ServiceBusAdministrationClient {
40+
private final ServiceBusAdministrationAsyncClient asyncClient;
4141

4242
/**
4343
* Creates a new instance with the given client.
4444
*
4545
* @param asyncClient Asynchronous client to perform management calls through.
4646
*/
47-
ServiceBusManagementClient(ServiceBusManagementAsyncClient asyncClient) {
47+
ServiceBusAdministrationClient(ServiceBusAdministrationAsyncClient asyncClient) {
4848
this.asyncClient = Objects.requireNonNull(asyncClient, "'asyncClient' cannot be null.");
4949
}
5050

0 commit comments

Comments
 (0)