This is an automated email from the ASF dual-hosted git repository. epugh pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 16e26fba2c225e3cf5d45f39f5f4211b836d24d6 Author: Eric Pugh <[email protected]> AuthorDate: Tue Oct 1 16:08:15 2024 -0400 SOLR-17442: Fix a errant deprecation of --debug and properly look up --verbose (#2732) getOpt and getLongOpt are not equivalent. getOpt only works if you have a one letter version of a command, so use getLongOpt for the --verbose flag. (cherry picked from commit 30d34cb95abb3979a65eb427230ad21584e3cb40) --- solr/core/src/java/org/apache/solr/cli/AssertTool.java | 11 ++++++++++- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 10 ++-------- solr/core/src/java/org/apache/solr/cli/ToolBase.java | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java index f9135ffa4cc..e00410a7060 100644 --- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java +++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java @@ -130,9 +130,18 @@ public class AssertTool extends ToolBase { .build()); } + /** + * Returns 100 error code for a true "error", otherwise returns the number of tests that failed. + * Otherwise, very similar to the parent runTool method. + * + * @param cli the command line object + * @return 0 on success, or a number corresponding to number of tests that failed, or 100 for a + * Error + * @throws Exception if a tool failed, e.g. authentication failure + */ @Override public int runTool(CommandLine cli) throws Exception { - verbose = cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt()); + verbose = cli.hasOption(SolrCLI.OPTION_VERBOSE.getLongOpt()); int toolExitStatus = 0; try { diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java index 93e87df9683..8c39ee1664c 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -147,14 +147,8 @@ public class SolrCLI implements CLIO { .build(); public static final Option OPTION_VERBOSE = - Option.builder("v") + Option.builder() .longOpt("verbose") - .deprecated( - DeprecatedAttributes.builder() - .setForRemoval(true) - .setSince("9.8") - .setDescription("Use --debug instead") - .get()) .required(false) .desc("Enable verbose command output.") .build(); @@ -347,7 +341,7 @@ public class SolrCLI implements CLIO { } public static void raiseLogLevelUnlessVerbose(CommandLine cli) { - if (!cli.hasOption(OPTION_VERBOSE.getOpt()) + if (!cli.hasOption(OPTION_VERBOSE.getLongOpt()) && !cli.hasOption(OPTION_VERBOSE_DEPRECATED.getOpt())) { StartupLoggingUtils.changeLogLevel("WARN"); } diff --git a/solr/core/src/java/org/apache/solr/cli/ToolBase.java b/solr/core/src/java/org/apache/solr/cli/ToolBase.java index a668ed22b5e..dc6ea714332 100644 --- a/solr/core/src/java/org/apache/solr/cli/ToolBase.java +++ b/solr/core/src/java/org/apache/solr/cli/ToolBase.java @@ -51,7 +51,7 @@ public abstract class ToolBase implements Tool { @Override public int runTool(CommandLine cli) throws Exception { verbose = - cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt()) + cli.hasOption(SolrCLI.OPTION_VERBOSE.getLongOpt()) || cli.hasOption(SolrCLI.OPTION_VERBOSE_DEPRECATED); int toolExitStatus = 0;
