Technoboy- commented on code in PR #16329:
URL: https://github.com/apache/pulsar/pull/16329#discussion_r914593659
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java:
##########
@@ -911,44 +911,45 @@ protected CompletableFuture<Void>
internalSetAutoTopicCreationAsync(
}));
}
- protected void internalSetAutoSubscriptionCreation(
- AsyncResponse asyncResponse, AutoSubscriptionCreationOverride
autoSubscriptionCreationOverride) {
- validateNamespacePolicyOperation(namespaceName,
PolicyName.AUTO_SUBSCRIPTION_CREATION, PolicyOperation.WRITE);
- validatePoliciesReadOnlyAccess();
-
+ protected CompletableFuture<Void>
internalSetAutoSubscriptionCreationAsync(AutoSubscriptionCreationOverride
+
autoSubscriptionCreationOverride) {
// Force to read the data s.t. the watch to the cache content is setup.
- namespaceResources().setPoliciesAsync(namespaceName, policies -> {
- policies.autoSubscriptionCreationOverride =
autoSubscriptionCreationOverride;
- return policies;
- }).thenApply(r -> {
- if (autoSubscriptionCreationOverride != null) {
- String autoOverride =
autoSubscriptionCreationOverride.isAllowAutoSubscriptionCreation() ? "enabled"
- : "disabled";
- log.info("[{}] Successfully {} autoSubscriptionCreation on
namespace {}", clientAppId(),
- autoOverride != null ? autoOverride : "removed",
namespaceName);
- }
- asyncResponse.resume(Response.noContent().build());
- return null;
- }).exceptionally(e -> {
- log.error("[{}] Failed to modify autoSubscriptionCreation status
on namespace {}", clientAppId(),
- namespaceName, e.getCause());
- if (e.getCause() instanceof NotFoundException) {
- asyncResponse.resume(new RestException(Status.NOT_FOUND,
"Namespace does not exist"));
- return null;
- }
- asyncResponse.resume(new RestException(e.getCause()));
- return null;
- });
+ return validateNamespacePolicyOperationAsync(namespaceName,
PolicyName.AUTO_SUBSCRIPTION_CREATION,
+ PolicyOperation.WRITE)
+ .thenCompose(__ -> validatePoliciesReadOnlyAccessAsync())
+ .thenCompose(unused ->
namespaceResources().setPoliciesAsync(namespaceName, policies -> {
+ policies.autoSubscriptionCreationOverride =
autoSubscriptionCreationOverride;
+ return policies;
+ }))
+ .thenAccept(r -> {
+ if (autoSubscriptionCreationOverride != null) {
+ String autoOverride =
autoSubscriptionCreationOverride.isAllowAutoSubscriptionCreation()
+ ? "enabled" : "disabled";
+ log.info("[{}] Successfully {}
autoSubscriptionCreation on namespace {}", clientAppId(),
+ autoOverride, namespaceName);
+ } else {
+ log.info("[{}] Successfully remove
autoSubscriptionCreation on namespace {}",
+ clientAppId(), namespaceName);
+ }
+ })
+ .exceptionally(ex -> {
Review Comment:
Maybe we can remove this 'exceptionally' block, because you handle this in
Rest layer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
