From efeefa5d1825b9cb798452ebec9cfb2b627187e1 Mon Sep 17 00:00:00 2001 From: Stanislav Kozlovski Date: Wed, 29 May 2019 14:46:39 +0300 Subject: [PATCH] MINOR: Check invalid bootstrap-server, alter option and config flags before checking for the required --partitions flag (#6786) Reviewers: Manikumar Reddy --- core/src/main/scala/kafka/admin/TopicCommand.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/kafka/admin/TopicCommand.scala b/core/src/main/scala/kafka/admin/TopicCommand.scala index b21989efd88..f28a26735d0 100755 --- a/core/src/main/scala/kafka/admin/TopicCommand.scala +++ b/core/src/main/scala/kafka/admin/TopicCommand.scala @@ -635,12 +635,13 @@ object TopicCommand extends Logging { CommandLineUtils.checkRequiredArgs(parser, options, topicOpt) if (has(createOpt) && !has(replicaAssignmentOpt)) CommandLineUtils.checkRequiredArgs(parser, options, partitionsOpt, replicationFactorOpt) - if (has(bootstrapServerOpt) && has(alterOpt)) + if (has(bootstrapServerOpt) && has(alterOpt)) { + CommandLineUtils.checkInvalidArgsSet(parser, options, Set(bootstrapServerOpt, configOpt), Set(alterOpt)) CommandLineUtils.checkRequiredArgs(parser, options, partitionsOpt) + } // check invalid args CommandLineUtils.checkInvalidArgs(parser, options, configOpt, allTopicLevelOpts -- Set(alterOpt, createOpt)) - CommandLineUtils.checkInvalidArgsSet(parser, options, Set(bootstrapServerOpt, configOpt), Set(alterOpt)) CommandLineUtils.checkInvalidArgs(parser, options, deleteConfigOpt, allTopicLevelOpts -- Set(alterOpt) ++ Set(bootstrapServerOpt)) CommandLineUtils.checkInvalidArgs(parser, options, partitionsOpt, allTopicLevelOpts -- Set(alterOpt, createOpt)) CommandLineUtils.checkInvalidArgs(parser, options, replicationFactorOpt, allTopicLevelOpts -- Set(createOpt))