build.gradle.kts

@@ -1,7 +1,7 @@
 
 
 object This {
-    val version = "1.81"
+    val version = "1.82"
     val artifactId = "jcommander"
     val groupId = "com.beust"
     val description = "Command line parsing library for Java"
@@ -59,14 +59,21 @@ plugins {
 }
 
 dependencies {
-    listOf("org.testng:testng:7.0.0")
-        .forEach { testCompile(it) }
+    listOf("org.testng:testng:7.0.0", "com.fasterxml.jackson.core:jackson-core:2.13.1",
+        "com.fasterxml.jackson.core:jackson-annotations:2.13.1")
+            .forEach { testImplementation(it) }
 }
 
 //
 // Releases:
 // ./gradlew bintrayUpload (to JCenter)
 // ./gradlew publish (to Sonatype, then go to https://oss.sonatype.org/index.html#stagingRepositories to publish)
+// Make sure that ~/.gradle/gradle.properties:
+//     signing.keyId=XXXXXXXX
+//     signing.password=
+//     signing.secretKeyRingFile=../../.gnupg/secring.gpg
+// lists a key that's listed in the keyring
+// (gpg --list-keys, last eight digits of the key)
 //
 
 bintray {
@@ -111,6 +118,7 @@ with(publishing) {
             afterEvaluate {
                 from(components["java"])
             }
+            suppressAllPomMetadataWarnings()
             artifact(sourcesJar)
             artifact(javadocJar)
             pom {
@@ -120,7 +128,7 @@ with(publishing) {
                 licenses {
                     license {
                         name.set("Apache License, Version 2.0")
-                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                        url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
                     }
                 }
                 issueManagement {
@@ -143,15 +151,14 @@ with(publishing) {
     }
 
     repositories {
-        mavenLocal()
         maven {
             name = "sonatype"
             url = if (This.version.contains("SNAPSHOT"))
                 uri("https://oss.sonatype.org/content/repositories/snapshots/") else
                 uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
             credentials {
-                username = project.findProperty("sonatypeUser") as? String
-                password = project.findProperty("sonatypePassword") as? String
+                username = project.findProperty("sonatypeUser")?.toString() ?: System.getenv("SONATYPE_USER")
+                password = project.findProperty("sonatypePassword")?.toString() ?: System.getenv("SONATYPE_PASSWORD")
             }
         }
         maven {

src/main/java/com/beust/jcommander/DefaultUsageFormatter.java

@@ -244,6 +244,18 @@ public void appendAllParametersDetails(StringBuilder out, int indentCount, Strin
      * @param indent the indentation
      */
     public void appendCommands(StringBuilder out, int indentCount, int descriptionIndent, String indent) {
+        boolean hasOnlyHiddenCommands = true;
+        for (Map.Entry<JCommander.ProgramName, JCommander> commands : commander.getRawCommands().entrySet()) {
+            Object arg = commands.getValue().getObjects().get(0);
+            Parameters p = arg.getClass().getAnnotation(Parameters.class);
+
+            if (p == null || !p.hidden())
+                hasOnlyHiddenCommands = false;
+        }
+
+        if (hasOnlyHiddenCommands)
+            return;
+
         out.append(indent + "  Commands:\n");
 
         // The magic value 3 is the number of spaces between the name of the option and its description

src/main/java/com/beust/jcommander/IParameterizedParser.java

@@ -0,0 +1,24 @@
+package com.beust.jcommander;
+
+import java.util.List;
+
+/**
+ * Thin interface allows the Parameterized parsing mechanism, which reflects an object to find the 
+ * JCommander annotations, to be replaced at runtime for cases where the source code cannot
+ * be directly annotated with JCommander annotations, but may have other annotations such as 
+ * JSON annotations that can be used to reflect as JCommander parameters.
+ *
+ * @author Tim Gallagher
+ */
+public interface IParameterizedParser {
+
+  /**
+   * Parses the given object for any command line related annotations and returns the list of 
+   * JCommander Parameterized definitions.
+   * 
+   * @param annotatedObj the object that contains the annotations.
+   * @return non-null List but may be empty
+   */
+  List<Parameterized> parseArg(Object annotatedObj);
+
+}

src/main/java/com/beust/jcommander/JCommander.java

@@ -18,6 +18,7 @@
 
 package com.beust.jcommander;
 
+import com.beust.jcommander.parser.DefaultParameterizedParser;
 import com.beust.jcommander.FuzzyMap.IKey;
 import com.beust.jcommander.converters.*;
 import com.beust.jcommander.internal.*;
@@ -46,6 +47,8 @@
  */
 public class JCommander {
     public static final String DEBUG_PROPERTY = "jcommander.debug";
+
+    protected IParameterizedParser parameterizedParser = new DefaultParameterizedParser();
 
     /**
      * A map to look up parameter description per option name.
@@ -264,6 +267,10 @@ public JCommander(Object object, String... args) {
         parse(args);
     }
 
+  public void setParameterizedParser(IParameterizedParser parameterizedParser) {
+    this.parameterizedParser = parameterizedParser;
+  }    
+
     /**
      * Disables expanding {@code @file}.
      *
@@ -598,7 +605,7 @@ public void createDescriptions() {
     private void addDescription(Object object) {
         Class<?> cls = object.getClass();
 
-        List<Parameterized> parameterizeds = Parameterized.parseArg(object);
+        List<Parameterized> parameterizeds = parameterizedParser.parseArg(object);
         for (Parameterized parameterized : parameterizeds) {
             WrappedParameter wp = parameterized.getWrappedParameter();
             if (wp != null && wp.getParameter() != null) {

src/main/java/com/beust/jcommander/parser/DefaultParameterizedParser.java

@@ -0,0 +1,26 @@
+package com.beust.jcommander.parser;
+
+import com.beust.jcommander.IParameterizedParser;
+import com.beust.jcommander.Parameterized;
+import java.util.List;
+
+/**
+ * Pulled from the JCommander where is reflects the object to determine the Parameter annotations.
+ *
+ * @author Tim Gallagher
+ */
+public class DefaultParameterizedParser implements IParameterizedParser {
+
+  /**
+  * Wraps the default parser. 
+  *
+  * @param annotatedObj an instance of the object with Parameter related annotations.
+  *
+  * @author Tim Gallagher
+  */
+  @Override
+  public List<Parameterized> parseArg(Object annotatedObj) {
+    return Parameterized.parseArg(annotatedObj);
+  }
+
+}