Skip to content

Commit 12f8db1

Browse files
authored
[ISSUE #9821] Fix getBrokerConfig no response issue for empty parameters (#9822)
* [ISSUE #9821] Fix getBrokerConfig no response issue for empty parameters * Update * Update test
1 parent e4170f5 commit 12f8db1

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

tools/src/main/java/org/apache/rocketmq/tools/command/broker/GetBrokerConfigCommand.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import org.apache.commons.cli.CommandLine;
2727
import org.apache.commons.cli.Option;
28+
import org.apache.commons.cli.OptionGroup;
2829
import org.apache.commons.cli.Options;
2930
import org.apache.rocketmq.client.exception.MQBrokerException;
3031
import org.apache.rocketmq.remoting.RPCHook;
@@ -50,13 +51,11 @@ public String commandDesc() {
5051

5152
@Override
5253
public Options buildCommandlineOptions(final Options options) {
53-
Option opt = new Option("b", "brokerAddr", true, "get which broker");
54-
opt.setRequired(false);
55-
options.addOption(opt);
56-
57-
opt = new Option("c", "clusterName", true, "get which cluster");
58-
opt.setRequired(false);
59-
options.addOption(opt);
54+
OptionGroup group = new OptionGroup();
55+
group.addOption(new Option("b", "brokerAddr", true, "get which broker"));
56+
group.addOption(new Option("c", "clusterName", true, "get which cluster"));
57+
group.setRequired(true);
58+
options.addOptionGroup(group);
6059

6160
return options;
6261
}

tools/src/test/java/org/apache/rocketmq/tools/command/broker/GetBrokerConfigCommandTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected byte[] getBody() {
4848
public void testExecute() throws SubCommandException {
4949
GetBrokerConfigCommand cmd = new GetBrokerConfigCommand();
5050
Options options = ServerUtil.buildCommandlineOptions(new Options());
51-
String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
51+
String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort()};
5252
final CommandLine commandLine =
5353
ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
5454
cmd.buildCommandlineOptions(options), new DefaultParser());

0 commit comments

Comments
 (0)