normalized line endings

david-waltermire · May 26, 2024 · 2245444 · 2245444
1 parent 342eddd
commit 2245444
Show file tree

Hide file tree

Showing 12 changed files with 160 additions and 106 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+# To list all file extensions:
+# git ls-files | awk -F . {'print $NF'}|sort -u
+#
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# files that are binary
+*.png
+*.jpg
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
@@ -196,7 +196,7 @@ private ExitStatus parseCommand(String... args) {
     return status;
   }
 
-  protected List<ICommand> getTopLevelCommands() {
+  protected final List<ICommand> getTopLevelCommands() {
     List<ICommand> retval = Collections.unmodifiableList(commands);
     assert retval != null;
     return retval;
@@ -221,7 +221,7 @@ public static void handleQuiet() {
 
   protected void showVersion() {
     @SuppressWarnings("resource") PrintStream out = AnsiConsole.out(); // NOPMD - not owner
-    getVersionInfos().stream().forEach((info) -> {
+    getVersionInfos().stream().forEach(info -> {
       out.println(ansi()
           .bold().a(info.getName()).boldOff()
           .a(" ")
@@ -265,35 +265,31 @@ public CallingContext(@NonNull List<String> args) {
 
       boolean endArgs = false;
       for (String arg : args) {
-        if (endArgs) {
+        if (endArgs || arg.startsWith("-")) {
           extraArgs.add(arg);
+        } else if ("--".equals(arg)) {
+          endArgs = true;
         } else {
-          if (arg.startsWith("-")) {
+          ICommand command;
+          if (calledCommands.isEmpty()) {
+            command = topLevelCommandMap.get(arg);
+          } else {
+            command = calledCommands.getLast();
+            command = command.getSubCommandByName(arg);
+          }
+
+          if (command == null) {
             extraArgs.add(arg);
-          } else if ("--".equals(arg)) {
             endArgs = true;
           } else {
-            ICommand command;
-            if (calledCommands.isEmpty()) {
-              command = topLevelCommandMap.get(arg);
-            } else {
-              command = calledCommands.getLast();
-              command = command.getSubCommandByName(arg);
-            }
-
-            if (command == null) {
-              extraArgs.add(arg);
-              endArgs = true;
-            } else {
-              calledCommands.add(command);
-            }
+            calledCommands.add(command);
           }
         }
       }
 
       if (LOGGER.isDebugEnabled()) {
         String commandChain = calledCommands.stream()
-            .map(command -> command.getName())
+            .map(ICommand::getName)
             .collect(Collectors.joining(" -> "));
         LOGGER.debug("Processing command chain: {}", commandChain);
       }
@@ -548,7 +544,7 @@ protected String buildHelpCliSyntax() {
 
       // output required options
       getOptionsList().stream()
-          .filter(option -> option.isRequired())
+          .filter(Option::isRequired)
           .forEach(option -> {
             builder
                 .append(' ')

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
@@ -51,7 +51,7 @@ protected AbstractParentCommand(boolean subCommandRequired) {
     this.subCommandRequired = subCommandRequired;
   }
 
-  protected void addCommandHandler(ICommand handler) {
+  protected final void addCommandHandler(ICommand handler) {
     String commandName = handler.getName();
     this.commandToSubcommandHandlerMap.put(commandName, handler);
   }
@@ -87,7 +87,7 @@ protected ExitStatus executeCommand(
       status = ExitCode.INVALID_COMMAND
           .exitMessage("Please use one of the following sub-commands: " +
               getSubCommands().stream()
-                  .map(command -> command.getName())
+                  .map(ICommand::getName)
                   .collect(Collectors.joining(", ")));
     } else {
       status = ExitCode.OK.exit();

diff --git a/databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext b/databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext
@@ -1 +1 @@
-org.eclipse.persistence.jaxb.JAXBContextFactory 
+org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/...nd/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension-removed b/...nd/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension-removed
diff --git a/...main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java b/...main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
@@ -115,7 +115,7 @@ public ICommandExecutor newExecutor(CallingContext callingContext, CommandLine c
     return new OscalCommandExecutor(callingContext, commandLine);
   }
 
-  private class OscalCommandExecutor
+  private final class OscalCommandExecutor
       extends AbstractValidationCommandExecutor {
 
     private Path tempDir;

diff --git a/metaschema-documentation-generator/xml-outline.html b/metaschema-documentation-generator/xml-outline.html
@@ -1,51 +1,51 @@
-<div xmlns="http://www.w3.org/1999/xhtml" class="xml-outline">
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
-  <div class="model-container">
-    <details class="OM-entry" open="open">
-      <summary>
-        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
-      </summary>
-    </details>
-  </div>
+<div xmlns="http://www.w3.org/1999/xhtml" class="xml-outline">
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
+  <div class="model-container">
+    <details class="OM-entry" open="open">
+      <summary>
+        <span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
+      </summary>
+    </details>
+  </div>
 </div>
diff --git a/metaschema-maven-plugin/src/it/generate-sources/verify.groovy b/metaschema-maven-plugin/src/it/generate-sources/verify.groovy
@@ -1,2 +1,2 @@
-File genSources = new File(basedir, 'target/generated-sources/metaschema/');
+File genSources = new File(basedir, 'target/generated-sources/metaschema/');
 assert genSources.exists(), "Didn't find generated sources [" + genSources.getAbsolutePath() + "]";
diff --git a/...plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java b/...plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java
@@ -227,10 +227,14 @@ protected final String getEncoding() {
     if (this.encoding != null) {
       // first try to use the provided encoding
       encoding = this.encoding;
-      getLog().debug(String.format("Using configured encoding [%s].", encoding));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Using configured encoding [%s].", encoding));
+      }
     } else {
       encoding = System.getProperty(SYSTEM_FILE_ENCODING_PROPERTY);
-      getLog().warn(String.format("Using system encoding [%s]. This build is platform dependent!", encoding));
+      if (getLog().isWarnEnabled()) {
+        getLog().warn(String.format("Using system encoding [%s]. This build is platform dependent!", encoding));
+      }
     }
     return encoding;
   }
@@ -304,7 +308,9 @@ protected boolean isGenerationRequired() {
     final File staleFile = getStaleFile();
     boolean generate = !staleFile.exists();
     if (generate) {
-      getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      }
       generate = true;
     } else {
       generate = false;
@@ -315,13 +321,17 @@ protected boolean isGenerationRequired() {
       URI metaschemaDirRelative = getMavenProject().getBasedir().toURI().relativize(metaschemaDir.toURI());
 
       if (buildContext.isIncremental() && buildContext.hasDelta(metaschemaDirRelative.toString())) {
-        getLog().info("metaschemaDirRelative: " + metaschemaDirRelative.toString());
+        if (getLog().isInfoEnabled()) {
+          getLog().info("metaschemaDirRelative: " + metaschemaDirRelative.toString());
+        }
         generate = true;
       }
 
       if (!generate) {
         for (File sourceFile : getModuleSources().collect(Collectors.toList())) {
-          getLog().info("Source file: " + sourceFile.getPath());
+          if (getLog().isInfoEnabled()) {
+            getLog().info("Source file: " + sourceFile.getPath());
+          }
           if (sourceFile.lastModified() > staleLastModified) {
             generate = true;
           }

diff --git a/...ven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java b/...ven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java
@@ -193,11 +193,12 @@ protected void generate(@NonNull Set<IModule> modules) throws MojoExecutionExcep
 
     Path outputDirectory = ObjectUtils.notNull(getOutputDirectory().toPath());
     for (IModule module : modules) {
-      getLog().info(String.format("Processing metaschema: %s", module.getLocation()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Processing metaschema: %s", module.getLocation()));
+      }
       if (module.getExportedRootAssemblyDefinitions().isEmpty()) {
         continue;
       }
-
       generateSchemas(module, schemaGenerationConfig, outputDirectory, schemaFormats);
     }
   }
@@ -252,23 +253,31 @@ public void execute() throws MojoExecutionException {
     try {
       staleFile = staleFile.getCanonicalFile();
     } catch (IOException ex) {
-      getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
+      if (getLog().isWarnEnabled()) {
+        getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
+      }
     }
 
     boolean generate;
     if (shouldExecutionBeSkipped()) {
-      getLog().debug(String.format("Schema generation is configured to be skipped. Skipping."));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Schema generation is configured to be skipped. Skipping."));
+      }
       generate = false;
     } else if (staleFile.exists()) {
       generate = isGenerationRequired();
     } else {
-      getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      }
       generate = true;
     }
 
     if (generate) {
       File outputDir = getOutputDirectory();
-      getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
+      }
 
       if (!outputDir.exists() && !outputDir.mkdirs()) {
         throw new MojoExecutionException("Unable to create output directory: " + outputDir);
@@ -289,7 +298,9 @@ public void execute() throws MojoExecutionException {
       loader.allowEntityResolution();
       final Set<IModule> modules = new HashSet<>();
       for (File source : getModuleSources().collect(Collectors.toList())) {
-        getLog().info("Using metaschema source: " + source.getPath());
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Using metaschema source: " + source.getPath());
+        }
         IModule module;
         try {
           module = loader.load(source);
@@ -309,7 +320,9 @@ public void execute() throws MojoExecutionException {
           = Files.newOutputStream(staleFile.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE,
               StandardOpenOption.TRUNCATE_EXISTING)) {
         os.close();
-        getLog().info("Created stale file: " + staleFile);
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Created stale file: " + staleFile);
+        }
       } catch (IOException ex) {
         throw new MojoExecutionException("Failed to write stale file: " + staleFile.getPath(), ex);
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.eclipse.persistence.jaxb.JAXBContextFactory
		org.eclipse.persistence.jaxb.JAXBContextFactory