Fix doclet options parsing and some tests

== CustomOption

- Add hyphen prefix to the option name only when creating the Doclet option.
  The Apache Commons CLI Option doesn't allow that on the name
  (may the hyphen is added automatically after giving the name)
- Changes the CustomOption construtor to replaces a null `parameters` value
  by an empty string, since a split is performed to extract the individual
  option arguments (parameters) and the value cannot be null
- Provide a basic and general implementation of the process method.
  That was the stopping the options to be processed.
  The processing (validation) of each option may be different
  and an implementation should be provided when creating
  each option. But for now, a default implementation works as before.

== SupportedOptions

- If an option has no arguments, when creating it using the Apache Commons CLI,
  the argName method from the Option.builder() must not be called.
  Removes the method call from newNoArgOption() method
  and explicitly sets the number of arguments to 0
  (otherwise, it was being set as unlimited).

= AbstractTest

- Changes the way to get an instance of the javadoc command line tool,
  using the javax.tools.ToolProvider instead of java.util.spi.ToolProvider.
  The new API also provide the more specific DocumentationTool interface
  to execute the javadoc tool, which enables
  passing the doclet class more easily.

Signed-off-by: Manoel Campos <manoelcampos@gmail.com>

Author: manoelcampos

.gitignore

@@ -6,6 +6,7 @@ out/
 .project
 .gradle
 CHANGELOG.md
+javadoc.xml
 
 # IntelliJ IDEA
 .idea/

src/main/java/com/github/markusbernhardt/xmldoclet/CustomOption.java

@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author Manoel Campos
@@ -40,7 +41,7 @@ public static CustomOption of(final Option cliOption) {
         return new CustomOption(
                 cliOption.getArgs(),
                 cliOption.getDescription(),
-                List.of(cliOption.getOpt()),
+                List.of('-' + cliOption.getOpt()),
                 cliOption.getArgName());
     }
 
@@ -50,7 +51,7 @@ public CustomOption(
         this.argumentCount = argumentCount;
         this.description = description;
         this.names = new ArrayList<>(names);
-        this.parameters = parameters;
+        this.parameters = Objects.requireNonNullElse(parameters, "");
     }
 
     @Override
@@ -96,6 +97,6 @@ public String[] getParameterArray() {
      */
     @Override
     public boolean process(final String option, final List<String> arguments) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return arguments.size() == argumentCount;
     }
 }

src/main/java/com/github/markusbernhardt/xmldoclet/SupportedOptions.java

@@ -87,9 +87,8 @@ private void newArgOption(final String optionName, final String argName, final S
 
     private void newNoArgOption(final String optionName, final String description) {
         final var option = Option.builder(optionName)
-                .argName(optionName)
                 .required(false)
-                .hasArg(false)
+                .numberOfArgs(0)
                 .desc(description)
                 .build();
 

src/test/java/com/github/markusbernhardt/xmldoclet/AbstractTest.java

@@ -5,6 +5,8 @@
 import com.github.markusbernhardt.xmldoclet.xjc.Root;
 import org.junit.Test;
 
+import javax.tools.DocumentationTool;
+import javax.tools.ToolProvider;
 import java.io.File;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
@@ -13,7 +15,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.spi.ToolProvider;
 
 import static java.util.Arrays.stream;
 
@@ -128,9 +129,27 @@ public Root executeJavadoc(
 
             LOGGER.info("Executing doclet with arguments: " + join(" ", argumentList));
 
-            final var javadoc = ToolProvider.findFirst("javadoc").orElseThrow();
-            final String[] arguments = argumentList.toArray(new String[] {});
-            javadoc.run(infoWriter, errorWriter, arguments);
+            final DocumentationTool javadoc = ToolProvider.getSystemDocumentationTool();
+            if (javadoc == null) {
+                throw new IllegalStateException("No javadoc command available on the system");
+            }
+
+            // Create a task to run the doclet
+            final var task = javadoc.getTask(
+                    new PrintWriter(System.out, true, Charset.defaultCharset()), // output writer
+                    null, // file manager (use default)
+                    null, // diagnostic listener (use default)
+                    XmlDoclet.class,
+                    argumentList, // arguments
+                    null // compilation units (use default)
+            );
+
+            // Run the task
+            if (task.call()) {
+                System.out.println("Doclet ran successfully");
+            } else {
+                System.err.println("Doclet execution failed");
+            }
 
             LOGGER.info("done with doclet processing");
         } catch (Exception e) {