This is an automated email from the ASF dual-hosted git repository. yong pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 8f2ea49c7f07ed107a3a61ab3d9de6f483a92fcb Author: feynmanlin <[email protected]> AuthorDate: Mon Mar 1 13:01:10 2021 +0800 Keep the command max-subscriptions style consistent (#9750) ### Motivation There is no `-per-topic` suffix for topic-level, for example: namespace-level: get-max-producers-per-topic topic-level: get-max-producers But `get-max-subscriptions-per-topic` now has a suffix, which should be consistent with the rules of other commands. Since this interface has just been added and has not been released yet, there is no compatibility issue (cherry picked from commit 4f02ac8cd6d3e860c0287e865490aed00cbe3499) --- .../test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java | 6 +++--- .../src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java | 2 +- .../src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java index cf92d40..733594e 100644 --- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java +++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java @@ -851,11 +851,11 @@ public class PulsarAdminToolTest { verify(mockTopics).setInactiveTopicPolicies("persistent://myprop/clust/ns1/ds1" , new InactiveTopicPolicies(InactiveTopicDeleteMode.delete_when_no_subscriptions, 1, true)); - cmdTopics.run(split("get-max-subscriptions-per-topic persistent://myprop/clust/ns1/ds1")); + cmdTopics.run(split("get-max-subscriptions persistent://myprop/clust/ns1/ds1")); verify(mockTopics).getMaxSubscriptionsPerTopic("persistent://myprop/clust/ns1/ds1"); - cmdTopics.run(split("set-max-subscriptions-per-topic persistent://myprop/clust/ns1/ds1 -m 100")); + cmdTopics.run(split("set-max-subscriptions persistent://myprop/clust/ns1/ds1 -m 100")); verify(mockTopics).setMaxSubscriptionsPerTopic("persistent://myprop/clust/ns1/ds1", 100); - cmdTopics.run(split("remove-max-subscriptions-per-topic persistent://myprop/clust/ns1/ds1")); + cmdTopics.run(split("remove-max-subscriptions persistent://myprop/clust/ns1/ds1")); verify(mockTopics).removeMaxSubscriptionsPerTopic("persistent://myprop/clust/ns1/ds1"); // argument matcher for the timestamp in reset cursor. Since we can't verify exact timestamp, we check for a diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java index 0da4efc..f5f89be 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java @@ -348,7 +348,7 @@ public class CmdNamespaces extends CmdBase { @Parameter(description = "tenant/namespace", required = true) private java.util.List<String> params; - @Parameter(names = { "--maxSubscriptionsPerTopic", "-m" }, description = "Max subscriptions per topic", + @Parameter(names = { "--max-subscriptions-per-topic", "-m" }, description = "Max subscriptions per topic", required = true) private int maxSubscriptionsPerTopic; diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java index a0c17a7..65679d1 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java @@ -187,9 +187,9 @@ public class CmdTopics extends CmdBase { jcommander.addCommand("set-max-producers", new SetMaxProducers()); jcommander.addCommand("remove-max-producers", new RemoveMaxProducers()); - jcommander.addCommand("get-max-subscriptions-per-topic", new GetMaxSubscriptionsPerTopic()); - jcommander.addCommand("set-max-subscriptions-per-topic", new SetMaxSubscriptionsPerTopic()); - jcommander.addCommand("remove-max-subscriptions-per-topic", new RemoveMaxSubscriptionsPerTopic()); + jcommander.addCommand("get-max-subscriptions", new GetMaxSubscriptionsPerTopic()); + jcommander.addCommand("set-max-subscriptions", new SetMaxSubscriptionsPerTopic()); + jcommander.addCommand("remove-max-subscriptions", new RemoveMaxSubscriptionsPerTopic()); jcommander.addCommand("get-max-message-size", new GetMaxMessageSize()); jcommander.addCommand("set-max-message-size", new SetMaxMessageSize());
