Fixed issues with website generation.

Reformatted some code.
usnistgov · Jul 3, 2023 · c5b10d4 · c5b10d4
1 parent ee4798c
commit c5b10d4
Show file tree

Hide file tree

Showing 47 changed files with 126 additions and 132 deletions.
diff --git a/...processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java b/...processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java
@@ -44,7 +44,7 @@ public abstract class AbstractExitStatus implements ExitStatus {
 
   /**
    * Construct a new exit status based on the provided {@code exitCode}.
-   * 
+   *
    * @param exitCode
    *          the exit code
    */
@@ -59,7 +59,7 @@ public ExitCode getExitCode() {
 
   /**
    * Get the associated throwable.
-   * 
+   *
    * @return the throwable or {@code null}
    */
   @Override
@@ -76,7 +76,7 @@ public ExitStatus withThrowable(@NonNull Throwable throwable) {
 
   /**
    * Get the associated message.
-   * 
+   *
    * @return the message or {@code null}
    */
   @Nullable

diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java
@@ -138,7 +138,7 @@ public CLIProcessor(@NonNull String exec, @NonNull List<IVersionInfo> versionInf
 
   /**
    * Gets the command used to execute for use in help text.
-   * 
+   *
    * @return the command name
    */
   @NonNull
@@ -148,7 +148,7 @@ public String getExec() {
 
   /**
    * Retrieve the version information for this application.
-   * 
+   *
    * @return the versionInfo
    */
   @NonNull
@@ -164,7 +164,7 @@ public void addCommandHandler(@NonNull Command handler) {
    * Process a set of CLIProcessor arguments.
    * <p>
    * process().getExitCode().getStatusCode()
-   * 
+   *
    * @param args
    *          the arguments to process
    * @return the exit status
@@ -202,9 +202,8 @@ private static void handleNoColor() {
   }
 
   public static void handleQuiet() {
-    @SuppressWarnings("resource")
-    LoggerContext ctx = (LoggerContext) LogManager.getContext(false); // NOPMD not
-                                                                      // closable here
+    @SuppressWarnings("resource") LoggerContext ctx = (LoggerContext) LogManager.getContext(false); // NOPMD not
+                                                                                                    // closable here
     Configuration config = ctx.getConfiguration();
     LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
     Level oldLevel = loggerConfig.getLevel();
@@ -215,8 +214,7 @@ public static void handleQuiet() {
   }
 
   protected void showVersion() {
-    @SuppressWarnings("resource")
-    PrintStream out = AnsiConsole.out(); // NOPMD - not owner
+    @SuppressWarnings("resource") PrintStream out = AnsiConsole.out(); // NOPMD - not owner
     getVersionInfos().stream().forEach((info) -> {
       out.println(ansi()
           .bold().a(getExec()).boldOff()
@@ -232,12 +230,12 @@ protected void showVersion() {
     out.flush();
   }
 
-//  @SuppressWarnings("null")
-//  @NonNull
-//  public String[] getArgArray() {
-//    return Stream.concat(options.stream(), extraArgs.stream()).toArray(size -> new String[size]);
-//  }
-  
+  // @SuppressWarnings("null")
+  // @NonNull
+  // public String[] getArgArray() {
+  // return Stream.concat(options.stream(), extraArgs.stream()).toArray(size -> new String[size]);
+  // }
+
   public class CallingContext {
     @NonNull
     private final List<Option> options;
@@ -249,7 +247,7 @@ public class CallingContext {
     public CallingContext(@NonNull List<String> args) {
       Map<String, Command> topLevelCommandMap = getTopLevelCommands().stream()
           .collect(Collectors.toUnmodifiableMap(Command::getName, Functions.identity()));
-      
+
       List<Option> options = new LinkedList<>(OPTIONS);
       Deque<Command> calledCommands = new LinkedList<>();
       List<String> extraArgs = new LinkedList<>();
@@ -297,7 +295,7 @@ public CallingContext(@NonNull List<String> args) {
 
       assert options != null;
       assert extraArgs != null;
-      
+
       this.options = options;
       this.calledCommands = calledCommands;
       this.extraArgs = extraArgs;
@@ -330,7 +328,7 @@ protected Options toOptions() {
       }
       return retval;
     }
-    
+
     public ExitStatus processCommand() {
       CommandLineParser parser = new DefaultParser();
       CommandLine cmdLine;
@@ -404,7 +402,7 @@ public ExitStatus handleInvalidCommand(
 
     /**
      * Callback for providing a help header.
-     * 
+     *
      * @return the header or {@code null}
      */
     @Nullable
@@ -415,10 +413,10 @@ protected String buildHelpHeader() {
 
     /**
      * Callback for providing a help footer.
-     * 
+     *
      * @param exec
      *          the executable name
-     * 
+     *
      * @return the footer or {@code null}
      */
     @NonNull
@@ -467,7 +465,7 @@ private String buildHelpFooter() {
 
     /**
      * Get the CLI syntax.
-     * 
+     *
      * @return the CLI syntax to display in help output
      */
     protected String buildHelpCliSyntax() {
@@ -538,9 +536,9 @@ public void showHelp() {
       AnsiPrintStream out = AnsiConsole.out();
       int terminalWidth = Math.max(out.getTerminalWidth(), 40);
 
-      @SuppressWarnings("resource")
-      PrintWriter writer = new PrintWriter(out, true, StandardCharsets.UTF_8); // NOPMD -
-                                                                               // not owned
+      @SuppressWarnings("resource") PrintWriter writer = new PrintWriter(out, true, StandardCharsets.UTF_8); // NOPMD -
+                                                                                                             // not
+                                                                                                             // owned
       formatter.printHelp(
           writer,
           terminalWidth,

diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitCode.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitCode.java
@@ -44,7 +44,7 @@ public enum ExitCode {
 
   /**
    * Get the related status code for use with {@link System#exit(int)}.
-   * 
+   *
    * @return the statusCode
    */
   public int getStatusCode() {
@@ -53,7 +53,7 @@ public int getStatusCode() {
 
   /**
    * Exit without a message.
-   * 
+   *
    * @return the exit status
    */
   @NonNull
@@ -63,7 +63,7 @@ public ExitStatus exit() {
 
   /**
    * Exit with the associated message.
-   * 
+   *
    * @return the exit status
    */
   @NonNull
@@ -73,10 +73,10 @@ public ExitStatus exitMessage() {
 
   /**
    * Exit with the associated message and message arguments.
-   * 
+   *
    * @param messageArguments
    *          any message parameters
-   * 
+   *
    * @return the exit status
    */
   @NonNull

diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitStatus.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitStatus.java
@@ -32,7 +32,7 @@
 public interface ExitStatus {
   /**
    * Get the exit code information associated with this exit status.
-   * 
+   *
    * @return the exit code information
    */
   @NonNull
@@ -43,7 +43,7 @@ public interface ExitStatus {
 
   /**
    * Process the exit status.
-   * 
+   *
    * @param showStackTrace
    *          include the stack trace for the throwable, if associated
    * @see #withThrowable(Throwable)
@@ -52,7 +52,7 @@ public interface ExitStatus {
 
   /**
    * Associate a throwable with the exit status.
-   * 
+   *
    * @param throwable
    *          the throwable
    * @return this exit status

diff --git a/...sor/src/main/java/gov/nist/secauto/metaschema/cli/processor/InvalidArgumentException.java b/...sor/src/main/java/gov/nist/secauto/metaschema/cli/processor/InvalidArgumentException.java
@@ -45,7 +45,7 @@ public class InvalidArgumentException
 
   /**
    * Generate a new exception.
-   * 
+   *
    * @param message
    *          the message
    */
@@ -65,7 +65,7 @@ public Option getOption() {
 
   /**
    * Assign the option requiring an argument that wasn't provided on the command line.
-   * 
+   *
    * @param option
    *          the option to set
    */

diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/MessageExitStatus.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/MessageExitStatus.java
@@ -38,7 +38,7 @@ public class MessageExitStatus
 
   /**
    * Construct a new {@link ExitStatus} based on an array of message arguments.
-   * 
+   *
    * @param code
    *          the exit code to use.
    * @param messageArguments

diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/OptionUtils.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/OptionUtils.java
@@ -41,5 +41,4 @@ public static String toArgument(@NonNull Option option) {
     return option.hasLongOpt() ? "--" + option.getLongOpt() : "-" + option.getOpt();
   }
 
-
 }
diff --git a/...rc/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java b/...rc/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java
@@ -78,14 +78,14 @@ public ExitStatus executeCommand(CallingContext callingContext, CommandLine cmdL
     ExitStatus status;
     if (isSubCommandRequired()) {
       status = ExitCode.INVALID_COMMAND
-          .exitMessage("Please use one of the following sub-commands: "+
+          .exitMessage("Please use one of the following sub-commands: " +
               getSubCommands().stream()
-          .map(command -> command.getName())
-          .collect(Collectors.joining(", ")));
+                  .map(command -> command.getName())
+                  .collect(Collectors.joining(", ")));
     } else {
       status = ExitCode.OK.exit();
     }
-    return status; 
+    return status;
   }
 
 }
diff --git a/...cessor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ExtraArgument.java b/...cessor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ExtraArgument.java
@@ -33,7 +33,7 @@ public interface ExtraArgument {
 
   /**
    * The allowed number of arguments of this type.
-   * 
+   *
    * @return a positive integer value
    */
   int getNumber();

diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java
@@ -52,7 +52,7 @@ public static ExitStatus runCli(String[] args) {
     List<IVersionInfo> versions = List.of(
         new MetaschemaJavaVersion(),
         new MetaschemaVersion());
-    CLIProcessor processor = new CLIProcessor("metaschema-cli",versions);
+    CLIProcessor processor = new CLIProcessor("metaschema-cli", versions);
     processor.addCommandHandler(new ValidateCommand());
     processor.addCommandHandler(new GenerateSchemaCommand());
 

diff --git a/...rc/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java b/...rc/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
@@ -188,8 +188,7 @@ public ExitStatus executeCommand(CallingContext callingContext, CommandLine cmdL
     IBoundLoader loader = bindingContext.newBoundLoader();
 
     List<String> extraArgs = cmdLine.getArgList();
-    @SuppressWarnings("null")
-    Path source = resolvePathAgainstCWD(Paths.get(extraArgs.get(0)));
+    @SuppressWarnings("null") Path source = resolvePathAgainstCWD(Paths.get(extraArgs.get(0)));
     assert source != null;
 
     Format asFormat;

diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/package-info.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/package-info.java
@@ -24,4 +24,4 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.cli.commands;
+package gov.nist.secauto.metaschema.cli.commands;
diff --git a/...hema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java b/...hema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java
@@ -71,7 +71,7 @@ public static void handleValidationFindings(@NonNull List<? extends IValidationF
       }
     }
   }
-  
+
   public static void handleJsonValidationFinding(@NonNull JsonValidationFinding finding) {
     Ansi ansi = generatePreamble(finding.getSeverity());
 

diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/package-info.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/package-info.java
@@ -24,4 +24,4 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.cli.util;
+package gov.nist.secauto.metaschema.cli.util;
diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
@@ -33,9 +33,7 @@
 import gov.nist.secauto.metaschema.cli.processor.ExitCode;
 import gov.nist.secauto.metaschema.cli.processor.ExitStatus;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.opentest4j.MultipleFailuresError;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 

diff --git a/metaschema-freemarker-support/src/site/site.xml b/metaschema-freemarker-support/src/site/site.xml
diff --git a/metaschema-java-binding/pom.xml b/metaschema-java-binding/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>metaschema-java-binding</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Java Metaschema Data Binding</name>
+	<name>Metaschema Java Data Binding</name>
 	<description>A Metaschema binding-based parser for Java objects supporting serialization of conformant XML, JSON, and YAML data.</description>
 
 	<url>${site.url}${project.artifactId}/</url>