From 970258c2c83291d65a512381d2688e25eb1125f0 Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@gsa.gov>
Date: Fri, 1 Nov 2024 10:57:12 -0400
Subject: [PATCH] Started refactoring CLI commands to use more shared code.

---
 .../cli/processor/CLIProcessor.java           |  85 +++++-----
 .../command/AbstractTerminalCommand.java      |  24 ++-
 .../validation/XmlSchemaContentValidator.java |   3 +-
 .../metaschema/core/util/UriUtils.java        |  13 +-
 .../AbstractBindingModelContainerSupport.java |  18 ++
 .../impl/AssemblyModelContainerSupport.java   |  47 +++---
 .../metaschema/impl/BindingConstants.java     |   1 +
 .../impl/ChoiceModelContainerSupport.java     |  35 ++--
 .../gov/nist/secauto/metaschema/cli/CLI.java  |   2 +-
 .../commands/AbstractConvertSubcommand.java   |  27 +--
 .../AbstractValidateContentCommand.java       |  88 ++++------
 .../ConvertContentUsingModuleCommand.java     |   6 +-
 .../cli/commands/GenerateSchemaCommand.java   |  31 +---
 .../cli/commands/MetaschemaCommands.java      | 156 +++++++++++++++++-
 .../ValidateContentUsingModuleCommand.java    |  13 +-
 .../cli/commands/ValidateModuleCommand.java   |   7 +-
 .../metapath/EvaluateMetapathCommand.java     |   4 +-
 17 files changed, 346 insertions(+), 214 deletions(-)

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
index ff919cf54..c56a3b7d4 100644
--- 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
@@ -11,6 +11,7 @@
 import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument;
 import gov.nist.secauto.metaschema.cli.processor.command.ICommand;
 import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.IVersionInfo;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -35,11 +36,10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -164,6 +164,13 @@ private ExitStatus parseCommand(String... args) {
     assert commandArgs != null;
     CallingContext callingContext = new CallingContext(commandArgs);
 
+    if (LOGGER.isDebugEnabled()) {
+      String commandChain = callingContext.getCalledCommands().stream()
+          .map(ICommand::getName)
+          .collect(Collectors.joining(" -> "));
+      LOGGER.debug("Processing command chain: {}", commandChain);
+    }
+
     ExitStatus status;
     // the first two arguments should be the <command> and <operation>, where <type>
     // is the object type
@@ -177,10 +184,16 @@ private ExitStatus parseCommand(String... args) {
     return status;
   }
 
+  @NonNull
   protected final List<ICommand> getTopLevelCommands() {
-    List<ICommand> retval = Collections.unmodifiableList(commands);
-    assert retval != null;
-    return retval;
+    return CollectionUtil.unmodifiableList(commands);
+  }
+
+  @NonNull
+  protected final Map<String, ICommand> getTopLevelCommandsByName() {
+    return ObjectUtils.notNull(getTopLevelCommands()
+        .stream()
+        .collect(Collectors.toUnmodifiableMap(ICommand::getName, Function.identity())));
   }
 
   private static void handleNoColor() {
@@ -230,63 +243,43 @@ public class CallingContext {
     @NonNull
     private final List<Option> options;
     @NonNull
-    private final Deque<ICommand> calledCommands;
+    private final List<ICommand> calledCommands;
+    @Nullable
+    private final ICommand targetCommand;
     @NonNull
     private final List<String> extraArgs;
 
     @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
     public CallingContext(@NonNull List<String> args) {
-      Map<String, ICommand> topLevelCommandMap = getTopLevelCommands().stream()
-          .collect(Collectors.toUnmodifiableMap(ICommand::getName, Function.identity()));
-
+      @SuppressWarnings("PMD.LooseCoupling") LinkedList<ICommand> calledCommands = new LinkedList<>();
       List<Option> options = new LinkedList<>(OPTIONS);
-      Deque<ICommand> calledCommands = new LinkedList<>();
       List<String> extraArgs = new LinkedList<>();
 
-      boolean endArgs = false;
-      for (String arg : args) {
-        if (endArgs || arg.startsWith("-")) {
+      AtomicBoolean endArgs = new AtomicBoolean();
+      args.forEach(arg -> {
+        if (endArgs.get() || arg.startsWith("-")) {
           extraArgs.add(arg);
         } else if ("--".equals(arg)) {
-          endArgs = true;
+          endArgs.set(true);
         } else {
-          ICommand command;
-          if (calledCommands.isEmpty()) {
-            command = topLevelCommandMap.get(arg);
-          } else {
-            command = calledCommands.getLast();
-            command = command.getSubCommandByName(arg);
-          }
+          ICommand command = calledCommands.isEmpty()
+              ? getTopLevelCommandsByName().get(arg)
+              : calledCommands.getLast().getSubCommandByName(arg);
 
           if (command == null) {
             extraArgs.add(arg);
-            endArgs = true;
+            endArgs.set(true);
           } else {
             calledCommands.add(command);
+            options.addAll(command.gatherOptions());
           }
         }
-      }
-
-      if (LOGGER.isDebugEnabled()) {
-        String commandChain = calledCommands.stream()
-            .map(ICommand::getName)
-            .collect(Collectors.joining(" -> "));
-        LOGGER.debug("Processing command chain: {}", commandChain);
-      }
-
-      for (ICommand cmd : calledCommands) {
-        options.addAll(cmd.gatherOptions());
-      }
-
-      options = Collections.unmodifiableList(options);
-      extraArgs = Collections.unmodifiableList(extraArgs);
-
-      assert options != null;
-      assert extraArgs != null;
+      });
 
-      this.options = options;
-      this.calledCommands = calledCommands;
-      this.extraArgs = extraArgs;
+      this.calledCommands = CollectionUtil.unmodifiableList(calledCommands);
+      this.targetCommand = calledCommands.peekLast();
+      this.options = CollectionUtil.unmodifiableList(options);
+      this.extraArgs = CollectionUtil.unmodifiableList(extraArgs);
     }
 
     @NonNull
@@ -296,7 +289,7 @@ public CLIProcessor getCLIProcessor() {
 
     @Nullable
     public ICommand getTargetCommand() {
-      return calledCommands.peekLast();
+      return targetCommand;
     }
 
     @NonNull
@@ -305,7 +298,7 @@ protected List<Option> getOptionsList() {
     }
 
     @NonNull
-    private Deque<ICommand> getCalledCommands() {
+    private List<ICommand> getCalledCommands() {
       return calledCommands;
     }
 
@@ -499,7 +492,7 @@ protected String buildHelpCliSyntax() {
       StringBuilder builder = new StringBuilder(64);
       builder.append(getExec());
 
-      Deque<ICommand> calledCommands = getCalledCommands();
+      List<ICommand> calledCommands = getCalledCommands();
       if (!calledCommands.isEmpty()) {
         builder.append(calledCommands.stream()
             .map(ICommand::getName)
diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java
index a42ac1a85..87f18a501 100644
--- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java
+++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java
@@ -5,14 +5,21 @@
 
 package gov.nist.secauto.metaschema.cli.processor.command;
 
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.core.util.UriUtils;
+
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.Collections;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import nl.talsmasoftware.lazy4j.Lazy;
 
 public abstract class AbstractTerminalCommand implements ICommand {
+  private static Lazy<Path> currentWorkingDirectory = Lazy.lazy(() -> Paths.get("").toAbsolutePath());
 
   @SuppressWarnings("null")
   @Override
@@ -25,7 +32,20 @@ public boolean isSubCommandRequired() {
     return false;
   }
 
-  protected static Path resolvePathAgainstCWD(@NonNull Path path) {
-    return Paths.get("").toAbsolutePath().resolve(path).normalize();
+  @NonNull
+  protected static Path getCurrentWorkingDirectory() {
+    return ObjectUtils.notNull(currentWorkingDirectory.get());
+  }
+
+  protected static Path resolveAgainstCWD(@NonNull Path path) {
+    return getCurrentWorkingDirectory().resolve(path).normalize();
+  }
+
+  protected static URI resolveAgainstCWD(@NonNull URI uri) {
+    return getCurrentWorkingDirectory().toUri().resolve(uri.normalize());
+  }
+
+  protected static URI resolveAgainstCWD(@NonNull String uri) throws URISyntaxException {
+    return UriUtils.toUri(uri, getCurrentWorkingDirectory().toUri());
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java
index 041a6ced0..7558e2d4b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java
@@ -9,6 +9,7 @@
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
+import org.eclipse.jdt.annotation.Owning;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -60,7 +61,7 @@ private static Schema toSchema(@NonNull List<? extends Source> schemaSources) th
    * @throws SAXException
    *           if an error occurred while parsing the provided XML schemas
    */
-  public XmlSchemaContentValidator(@NonNull List<? extends Source> schemaSources) throws SAXException {
+  public XmlSchemaContentValidator(@Owning @NonNull List<? extends Source> schemaSources) throws SAXException {
     this(toSchema(ObjectUtils.requireNonNull(schemaSources, "schemaSources")));
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java
index 9bf7249c0..861ce637f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java
@@ -35,7 +35,7 @@ private UriUtils() {
    *          the base URI to use for URI normalization
    * @return a new URI
    * @throws URISyntaxException
-   *           an error if the location string is not convertible to URI
+   *           if the location string is not convertible to URI
    */
   @SuppressWarnings("PMD.PreserveStackTrace")
   @NonNull
@@ -91,12 +91,11 @@ public static URI relativize(URI base, URI other, boolean prepend) throws URISyn
 
   private static boolean hasSameSchemeAndAuthority(URI base, URI other) {
     String baseScheme = base.getScheme();
-    boolean retval = (baseScheme == null && other.getScheme() == null)
-        || (baseScheme != null && baseScheme.equals(other.getScheme()));
+    boolean retval = baseScheme == null && other.getScheme() == null
+        || baseScheme != null && baseScheme.equals(other.getScheme());
     String baseAuthority = base.getAuthority();
-    retval = retval && ((baseAuthority == null && other.getAuthority() == null)
-        || (baseAuthority != null && baseAuthority.equals(other.getAuthority())));
-    return retval;
+    return retval && (baseAuthority == null && other.getAuthority() == null
+        || baseAuthority != null && baseAuthority.equals(other.getAuthority()));
   }
 
   /**
@@ -132,7 +131,7 @@ public static String prependRelativePath(String base, String target) {
 
     // Construct the relative path
     StringBuilder retval = new StringBuilder();
-    for (int j = 0; j < (baseSegments.length - segmentIndex); j++) {
+    for (int j = 0; j < baseSegments.length - segmentIndex; j++) {
       retval.append("..");
       if (retval.length() != 0) {
         retval.append(URI_SEPERATOR);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java
index 0a6b457ba..c92d3fc6a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java
@@ -7,6 +7,8 @@
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
@@ -55,6 +57,22 @@ protected static void addInstance(
     fieldInstances.put(effectiveName, field);
   }
 
+  protected static void addInstance(
+      @NonNull IChoiceInstance choice,
+      @NonNull List<IModelInstanceAbsolute> modelInstances,
+      @NonNull List<IChoiceInstance> choiceInstances) {
+    modelInstances.add(choice);
+    choiceInstances.add(choice);
+  }
+
+  protected static void addInstance(
+      @NonNull IChoiceGroupInstance choiceGroup,
+      @NonNull List<IModelInstanceAbsolute> modelInstances,
+      @NonNull Map<String, IChoiceGroupInstance> choiceGroupInstances) {
+    modelInstances.add(choiceGroup);
+    choiceGroupInstances.put(choiceGroup.getGroupAsName(), choiceGroup);
+  }
+
   @NonNull
   protected static IAssemblyInstanceAbsolute newInstance(
       @NonNull AssemblyReference obj,
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java
index c995d6170..63bf64851 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java
@@ -31,6 +31,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.xml.namespace.QName;
 
@@ -95,7 +96,11 @@ IChoiceGroupInstance> of(
    * @param nodeItemFactory
    *          the node item factory used to generate child nodes
    */
-  @SuppressWarnings({ "PMD.AvoidInstantiatingObjectsInLoops", "PMD.UseConcurrentHashMap", "PMD.PrematureDeclaration" })
+  @SuppressWarnings({
+      "PMD.AvoidInstantiatingObjectsInLoops",
+      "PMD.UseConcurrentHashMap",
+      "PMD.PrematureDeclaration",
+      "PMD.NPathComplexity" })
   @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   protected AssemblyModelContainerSupport(
       @NonNull AssemblyModel model,
@@ -112,17 +117,17 @@ protected AssemblyModelContainerSupport(
     final Map<String, IChoiceGroupInstance> choiceGroupInstances = new LinkedHashMap<>();
 
     // create counters to track child positions
-    int assemblyReferencePosition = 0;
-    int assemblyInlineDefinitionPosition = 0;
-    int fieldReferencePosition = 0;
-    int fieldInlineDefinitionPosition = 0;
-    int choicePosition = 0;
-    int choiceGroupPosition = 0;
-
-    // TODO: make "instances" a constant
+    AtomicInteger assemblyReferencePosition = new AtomicInteger();
+    AtomicInteger assemblyInlineDefinitionPosition = new AtomicInteger();
+    AtomicInteger fieldReferencePosition = new AtomicInteger();
+    AtomicInteger fieldInlineDefinitionPosition = new AtomicInteger();
+    AtomicInteger choicePosition = new AtomicInteger();
+    AtomicInteger choiceGroupPosition = new AtomicInteger();
+
     IBoundInstanceModelChoiceGroup instance = ObjectUtils.requireNonNull(
-        modelInstance.getDefinition().getChoiceGroupInstanceByName("instances"));
-    for (Object obj : ObjectUtils.notNull(model.getInstances())) {
+        modelInstance.getDefinition()
+            .getChoiceGroupInstanceByName(BindingConstants.METASCHEMA_CHOICE_GROUP_GROUP_AS_NAME));
+    ObjectUtils.notNull(model.getInstances()).forEach(obj -> {
       assert obj != null;
 
       IBoundInstanceModelGroupedAssembly objInstance
@@ -132,14 +137,14 @@ protected AssemblyModelContainerSupport(
         IAssemblyInstanceAbsolute assembly = newInstance(
             (AssemblyReference) obj,
             objInstance,
-            assemblyReferencePosition++,
+            assemblyReferencePosition.getAndIncrement(),
             parent);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
       } else if (obj instanceof InlineDefineAssembly) {
         IAssemblyInstanceAbsolute assembly = new InstanceModelAssemblyInline(
             (InlineDefineAssembly) obj,
             objInstance,
-            assemblyInlineDefinitionPosition++,
+            assemblyInlineDefinitionPosition.getAndIncrement(),
             parent,
             nodeItemFactory);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
@@ -147,38 +152,36 @@ protected AssemblyModelContainerSupport(
         IFieldInstanceAbsolute field = newInstance(
             (FieldReference) obj,
             objInstance,
-            fieldReferencePosition++,
+            fieldReferencePosition.getAndIncrement(),
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else if (obj instanceof InlineDefineField) {
         IFieldInstanceAbsolute field = new InstanceModelFieldInline(
             (InlineDefineField) obj,
             objInstance,
-            fieldInlineDefinitionPosition++,
+            fieldInlineDefinitionPosition.getAndIncrement(),
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else if (obj instanceof AssemblyModel.Choice) {
         IChoiceInstance choice = new InstanceModelChoice(
             (Choice) obj,
             objInstance,
-            choicePosition++,
+            choicePosition.getAndIncrement(),
             parent,
             nodeItemFactory);
-        modelInstances.add(choice);
-        choiceInstances.add(choice);
+        addInstance(choice, modelInstances, choiceInstances);
       } else if (obj instanceof AssemblyModel.ChoiceGroup) {
         IChoiceGroupInstance choiceGroup = new InstanceModelChoiceGroup(
             (ChoiceGroup) obj,
             objInstance,
-            choiceGroupPosition++,
+            choiceGroupPosition.getAndIncrement(),
             parent,
             nodeItemFactory);
-        modelInstances.add(choiceGroup);
-        choiceGroupInstances.put(choiceGroup.getGroupAsName(), choiceGroup);
+        addInstance(choiceGroup, modelInstances, choiceGroupInstances);
       } else {
         throw new UnsupportedOperationException(String.format("Unknown model instance class: %s", obj.getClass()));
       }
-    }
+    });
 
     this.modelInstances = modelInstances.isEmpty()
         ? CollectionUtil.emptyList()
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java
index 8d257fdaf..7442e8991 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java
@@ -13,6 +13,7 @@ public final class BindingConstants {
   public static final String METASCHEMA_FIELD_INLINE_DEFINTION_NAME = "define-field";
   public static final String METASCHEMA_CHOICE_NAME = "choice";
   public static final String METASCHEMA_CHOICE_GROUP_NAME = "choice-group";
+  public static final String METASCHEMA_CHOICE_GROUP_GROUP_AS_NAME = "instances";
 
   private BindingConstants() {
     // disable construction
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java
index ed3baa834..47ccfe812 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java
@@ -26,6 +26,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.xml.namespace.QName;
 
@@ -91,31 +92,35 @@ public ChoiceModelContainerSupport(
     final Map<QName, IAssemblyInstanceAbsolute> assemblyInstances = new LinkedHashMap<>();
 
     // create counters to track child positions
-    int assemblyReferencePosition = 0;
-    int assemblyInlineDefinitionPosition = 0;
-    int fieldReferencePosition = 0;
-    int fieldInlineDefinitionPosition = 0;
+    AtomicInteger assemblyReferencePosition = new AtomicInteger();
+    AtomicInteger assemblyInlineDefinitionPosition = new AtomicInteger();
+    AtomicInteger fieldReferencePosition = new AtomicInteger();
+    AtomicInteger fieldInlineDefinitionPosition = new AtomicInteger();
 
     // TODO: make "instances" a constant
     IBoundInstanceModelChoiceGroup instance = ObjectUtils.requireNonNull(
         bindingInstance.getDefinition().getChoiceGroupInstanceByName("choices"));
-    for (Object obj : ObjectUtils.notNull(binding.getChoices())) {
+
+    ObjectUtils.notNull(binding.getChoices()).forEach(obj -> {
       assert obj != null;
       IBoundInstanceModelGroupedAssembly objInstance
           = (IBoundInstanceModelGroupedAssembly) instance.getItemInstance(obj);
 
       if (obj instanceof AssemblyReference) {
-        IAssemblyInstanceAbsolute assembly = newInstance(
-            (AssemblyReference) obj,
-            objInstance,
-            assemblyReferencePosition++,
-            parent);
-        addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
+        addInstance(
+            newInstance(
+                (AssemblyReference) obj,
+                objInstance,
+                assemblyReferencePosition.getAndIncrement(),
+                parent),
+            modelInstances,
+            namedModelInstances,
+            assemblyInstances);
       } else if (obj instanceof InlineDefineAssembly) {
         IAssemblyInstanceAbsolute assembly = new InstanceModelAssemblyInline(
             (InlineDefineAssembly) obj,
             objInstance,
-            assemblyInlineDefinitionPosition++,
+            assemblyInlineDefinitionPosition.getAndIncrement(),
             parent,
             nodeItemFactory);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
@@ -123,20 +128,20 @@ public ChoiceModelContainerSupport(
         IFieldInstanceAbsolute field = newInstance(
             (FieldReference) obj,
             objInstance,
-            fieldReferencePosition++,
+            fieldReferencePosition.getAndIncrement(),
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else if (obj instanceof InlineDefineField) {
         IFieldInstanceAbsolute field = new InstanceModelFieldInline(
             (InlineDefineField) obj,
             objInstance,
-            fieldInlineDefinitionPosition++,
+            fieldInlineDefinitionPosition.getAndIncrement(),
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else {
         throw new UnsupportedOperationException(String.format("Unknown model instance class: %s", obj.getClass()));
       }
-    }
+    });
 
     this.modelInstances = modelInstances.isEmpty()
         ? CollectionUtil.emptyList()
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
index 0c57fb0a0..19b96471e 100644
--- 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
@@ -42,7 +42,7 @@ public static void main(String[] args) {
   public static ExitStatus runCli(String... args) {
     System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
 
-    Map<String, IVersionInfo> versions = new LinkedHashMap<>();
+    @SuppressWarnings("PMD.UseConcurrentHashMap") Map<String, IVersionInfo> versions = new LinkedHashMap<>();
     versions.put(CLIProcessor.COMMAND_VERSION, new MetaschemaJavaVersion());
     versions.put(MetaschemaConstants.METASCHEMA_NAMESPACE, new MetaschemaVersion());
 
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java
index 2e435e588..47c128e19 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java
@@ -16,7 +16,6 @@
 import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.AutoCloser;
-import gov.nist.secauto.metaschema.core.util.CustomCollectors;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.core.util.UriUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
@@ -41,7 +40,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -94,21 +92,6 @@ public List<ExtraArgument> getExtraArguments() {
   @SuppressWarnings("PMD.PreserveStackTrace") // intended
   @Override
   public void validateOptions(CallingContext callingContext, CommandLine cmdLine) throws InvalidArgumentException {
-
-    try {
-      String toFormatText = cmdLine.getOptionValue(TO_OPTION);
-      Format.valueOf(toFormatText.toUpperCase(Locale.ROOT));
-    } catch (IllegalArgumentException ex) {
-      InvalidArgumentException newEx = new InvalidArgumentException(
-          String.format("Invalid '%s' argument. The format must be one of: %s.",
-              OptionUtils.toArgument(TO_OPTION),
-              Format.names().stream()
-                  .collect(CustomCollectors.joiningWithOxfordComma("and"))));
-      newEx.setOption(TO_OPTION);
-      newEx.addSuppressed(ex);
-      throw newEx;
-    }
-
     List<String> extraArgs = cmdLine.getArgList();
     if (extraArgs.isEmpty() || extraArgs.size() > 2) {
       throw new InvalidArgumentException("Illegal number of arguments.");
@@ -200,8 +183,14 @@ public ExitStatus execute() {
       }
       assert source != null;
 
-      String toFormatText = cmdLine.getOptionValue(TO_OPTION);
-      Format toFormat = Format.valueOf(toFormatText.toUpperCase(Locale.ROOT));
+      Format toFormat;
+      try {
+        toFormat = MetaschemaCommands.getFormat(cmdLine, TO_OPTION);
+      } catch (InvalidArgumentException ex) {
+        return ExitCode.INVALID_ARGUMENTS
+            .exitMessage(ex.getLocalizedMessage())
+            .withThrowable(ex);
+      }
 
       IBindingContext bindingContext;
       try {
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
index 3829bd66e..44d38e718 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
@@ -19,18 +19,15 @@
 import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
-import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
 import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.ValidationFeature;
 import gov.nist.secauto.metaschema.core.model.validation.AggregateValidationResult;
 import gov.nist.secauto.metaschema.core.model.validation.IValidationResult;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.CustomCollectors;
 import gov.nist.secauto.metaschema.core.util.IVersionInfo;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.core.util.UriUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.IBindingContext.ISchemaValidationProvider;
 import gov.nist.secauto.metaschema.databind.io.Format;
@@ -51,7 +48,6 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -192,7 +188,7 @@ protected abstract IBindingContext getBindingContext(@NonNull Set<IConstraintSet
     @NonNull
     protected abstract IModule getModule(
         @NonNull CommandLine commandLine,
-        IBindingContext bindingContext)
+        @NonNull IBindingContext bindingContext)
         throws IOException, MetaschemaException;
 
     @NonNull
@@ -204,25 +200,18 @@ protected abstract ISchemaValidationProvider getSchemaValidationProvider(
     @SuppressWarnings("PMD.OnlyOneReturn") // readability
     @Override
     public ExitStatus execute() {
-      URI cwd = ObjectUtils.notNull(Paths.get("").toAbsolutePath().toUri());
       CommandLine cmdLine = getCommandLine();
+      URI currentWorkingDirectory = getCurrentWorkingDirectory().toUri();
 
       Set<IConstraintSet> constraintSets;
-      if (cmdLine.hasOption(CONSTRAINTS_OPTION)) {
-        IConstraintLoader constraintLoader = IBindingContext.getConstraintLoader();
-        constraintSets = new LinkedHashSet<>();
-        String[] args = cmdLine.getOptionValues(CONSTRAINTS_OPTION);
-        for (String arg : args) {
-          assert arg != null;
-          try {
-            URI constraintUri = ObjectUtils.requireNonNull(UriUtils.toUri(arg, cwd));
-            constraintSets.addAll(constraintLoader.load(constraintUri));
-          } catch (IOException | MetaschemaException | MetapathException | URISyntaxException ex) {
-            return ExitCode.IO_ERROR.exitMessage("Unable to load constraint set '" + arg + "'.").withThrowable(ex);
-          }
-        }
-      } else {
-        constraintSets = CollectionUtil.emptySet();
+      try {
+        constraintSets = MetaschemaCommands.loadConstraintSets(
+            cmdLine,
+            CONSTRAINTS_OPTION,
+            currentWorkingDirectory);
+      } catch (IOException | URISyntaxException ex) {
+        return ExitCode.IO_ERROR.exitMessage(
+            String.format("Unable to load constraint sets. %s", ex.getLocalizedMessage())).withThrowable(ex);
       }
 
       IBindingContext bindingContext;
@@ -240,43 +229,38 @@ public ExitStatus execute() {
 
       String sourceName = ObjectUtils.requireNonNull(extraArgs.get(0));
       URI source;
-
       try {
-        source = UriUtils.toUri(sourceName, cwd);
+        source = MetaschemaCommands.handleResource(sourceName, getCurrentWorkingDirectory().toUri());
       } catch (URISyntaxException ex) {
-        return ExitCode.IO_ERROR.exitMessage("Cannot load source '%s' as it is not a valid file or URI.")
+        return ExitCode.INVALID_ARGUMENTS.exitMessage("Cannot load source '%s' as it is not a valid file or URI.")
             .withThrowable(ex);
       }
 
       Format asFormat;
-      if (cmdLine.hasOption(AS_OPTION)) {
-        try {
-          String toFormatText = cmdLine.getOptionValue(AS_OPTION);
-          asFormat = Format.valueOf(toFormatText.toUpperCase(Locale.ROOT));
-        } catch (IllegalArgumentException ex) {
-          return ExitCode.IO_ERROR
-              .exitMessage("Invalid '--as' argument. The format must be one of: "
-                  + Arrays.stream(Format.values())
-                      .map(Enum::name)
-                      .collect(CustomCollectors.joiningWithOxfordComma("or")))
-              .withThrowable(ex);
-        }
-      } else {
-        // attempt to determine the format
-        try {
-          asFormat = loader.detectFormat(source);
-        } catch (FileNotFoundException ex) {
-          // this case was already checked for
-          return ExitCode.IO_ERROR.exitMessage("The provided source file '" + source + "' does not exist.");
-        } catch (IOException ex) {
-          return ExitCode.PROCESSING_ERROR.exit().withThrowable(ex);
-        } catch (IllegalArgumentException ex) {
-          return ExitCode.IO_ERROR.exitMessage(
-              "Source file has unrecognizable format. Use '--as' to specify the format. The format must be one of: "
-                  + Arrays.stream(Format.values())
-                      .map(Enum::name)
-                      .collect(CustomCollectors.joiningWithOxfordComma("or")));
-        }
+      try {
+        asFormat = MetaschemaCommands.determineSourceFormat(
+            cmdLine,
+            AS_OPTION,
+            loader,
+            source);
+      } catch (InvalidArgumentException ex) {
+        return ExitCode.INVALID_ARGUMENTS
+            .exitMessage(ex.getLocalizedMessage())
+            .withThrowable(ex);
+      } catch (FileNotFoundException ex) {
+        // this case was already checked for
+        return ExitCode.IO_ERROR
+            .exitMessage("The provided source file '" + source + "' does not exist.");
+      } catch (IOException ex) {
+        return ExitCode.IO_ERROR
+            .exitMessage(ex.getLocalizedMessage())
+            .withThrowable(ex);
+      } catch (IllegalArgumentException ex) {
+        return ExitCode.INVALID_ARGUMENTS.exitMessage(
+            "Source file has unrecognizable format. Use '--as' to specify the format. The format must be one of: "
+                + Arrays.stream(Format.values())
+                    .map(Enum::name)
+                    .collect(CustomCollectors.joiningWithOxfordComma("or")));
       }
 
       if (LOGGER.isInfoEnabled()) {
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java
index 59f7f35e9..28502e377 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java
@@ -66,13 +66,13 @@ public Collection<? extends Option> gatherOptions() {
   @Override
   public ICommandExecutor newExecutor(CallingContext callingContext, CommandLine commandLine) {
 
-    return new OscalCommandExecutor(callingContext, commandLine);
+    return new CommandExecutor(callingContext, commandLine);
   }
 
-  private final class OscalCommandExecutor
+  private final class CommandExecutor
       extends AbstractConversionCommandExecutor {
 
-    private OscalCommandExecutor(
+    private CommandExecutor(
         @NonNull CallingContext callingContext,
         @NonNull CommandLine commandLine) {
       super(callingContext, commandLine);
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java
index 31bea72c7..8d0ed4ac9 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java
@@ -20,10 +20,8 @@
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.xml.ModuleLoader;
 import gov.nist.secauto.metaschema.core.util.AutoCloser;
-import gov.nist.secauto.metaschema.core.util.CustomCollectors;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.core.util.UriUtils;
-import gov.nist.secauto.metaschema.databind.io.Format;
 import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator;
 import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat;
 import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature;
@@ -42,10 +40,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -107,23 +103,6 @@ public List<ExtraArgument> getExtraArguments() {
   @SuppressWarnings("PMD.PreserveStackTrace") // intended
   @Override
   public void validateOptions(CallingContext callingContext, CommandLine cmdLine) throws InvalidArgumentException {
-    try {
-      String asFormatText = cmdLine.getOptionValue(AS_OPTION);
-      if (asFormatText != null) {
-        SchemaFormat.valueOf(asFormatText.toUpperCase(Locale.ROOT));
-      }
-    } catch (IllegalArgumentException ex) {
-      InvalidArgumentException newEx = new InvalidArgumentException( // NOPMD - intentional
-          String.format("Invalid '%s' argument. The format must be one of: %s.",
-              OptionUtils.toArgument(AS_OPTION),
-              Arrays.asList(Format.values()).stream()
-                  .map(Enum::name)
-                  .collect(CustomCollectors.joiningWithOxfordComma("and"))));
-      newEx.setOption(AS_OPTION);
-      newEx.addSuppressed(ex);
-      throw newEx;
-    }
-
     List<String> extraArgs = cmdLine.getArgList();
     if (extraArgs.isEmpty() || extraArgs.size() > 2) {
       throw new InvalidArgumentException("Illegal number of arguments.");
@@ -181,8 +160,14 @@ protected ExitStatus executeCommand(
       }
     }
 
-    String asFormatText = cmdLine.getOptionValue(AS_OPTION);
-    SchemaFormat asFormat = SchemaFormat.valueOf(asFormatText.toUpperCase(Locale.ROOT));
+    SchemaFormat asFormat;
+    try {
+      asFormat = MetaschemaCommands.getSchemaFormat(cmdLine, AS_OPTION);
+    } catch (InvalidArgumentException ex) {
+      return ExitCode.INVALID_ARGUMENTS
+          .exitMessage(ex.getLocalizedMessage())
+          .withThrowable(ex);
+    }
 
     IMutableConfiguration<SchemaGenerationFeature<?>> configuration = new DefaultConfiguration<>();
     if (cmdLine.hasOption(INLINE_TYPES_OPTION)) {
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java
index 881bae0a9..cb5295b54 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java
@@ -6,25 +6,36 @@
 package gov.nist.secauto.metaschema.cli.commands;
 
 import gov.nist.secauto.metaschema.cli.commands.metapath.MetapathCommand;
+import gov.nist.secauto.metaschema.cli.processor.InvalidArgumentException;
 import gov.nist.secauto.metaschema.cli.processor.command.ICommand;
+import gov.nist.secauto.metaschema.core.metapath.MetapathException;
+import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
 import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.CustomCollectors;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.core.util.UriUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
+import gov.nist.secauto.metaschema.databind.io.Format;
+import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
 import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader;
+import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -82,18 +93,18 @@ public static IModule handleModule(
     return loader.load(moduleResource);
   }
 
+  /**
+   *
+   * @param location
+   * @param cwd
+   * @return
+   * @throws URISyntaxException
+   */
   @NonNull
   public static URI handleResource(
       @NonNull String location,
-      @NonNull URI cwd) throws IOException {
-    try {
-      return UriUtils.toUri(location, cwd);
-    } catch (URISyntaxException ex) {
-      IOException newEx = new IOException( // NOPMD - intentional
-          String.format("Cannot load module as '%s' is not a valid file or URL.", location));
-      newEx.addSuppressed(ex);
-      throw newEx;
-    }
+      @NonNull URI cwd) throws URISyntaxException {
+    return UriUtils.toUri(location, cwd);
   }
 
   @NonNull
@@ -117,6 +128,133 @@ public static IBindingContext newBindingContextWithDynamicCompilation(@NonNull S
         .build();
   }
 
+  @NonNull
+  public static Set<IConstraintSet> loadConstraintSets(
+      @NonNull CommandLine cmdLine,
+      @NonNull Option option,
+      @NonNull URI cwd) throws URISyntaxException, IOException {
+    Set<IConstraintSet> constraintSets;
+    if (cmdLine.hasOption(option)) {
+      IConstraintLoader constraintLoader = IBindingContext.getConstraintLoader();
+      constraintSets = new LinkedHashSet<>();
+      String[] args = cmdLine.getOptionValues(option);
+      for (String arg : args) {
+        assert arg != null;
+        URI constraintUri = ObjectUtils.requireNonNull(UriUtils.toUri(arg, cwd));
+        try {
+          constraintSets.addAll(constraintLoader.load(constraintUri));
+        } catch (MetaschemaException | MetapathException ex) {
+          throw new IOException(
+              String.format("Unable to process constraint set '%s'. %s",
+                  arg,
+                  ex.getLocalizedMessage()),
+              ex);
+        }
+      }
+    } else {
+      constraintSets = CollectionUtil.emptySet();
+    }
+    return constraintSets;
+  }
+
+  @NonNull
+  public static SchemaFormat getSchemaFormat(
+      @NonNull CommandLine cmdLine,
+      @NonNull Option option) throws InvalidArgumentException {
+    // use the option
+    String toFormatText = cmdLine.getOptionValue(option);
+    if (toFormatText == null) {
+      throw new IllegalArgumentException(
+          String.format("Option '%s' not provided.",
+              option.hasLongOpt()
+                  ? "--" + option.getLongOpt()
+                  : "-" + option.getOpt()));
+    }
+    try {
+      return SchemaFormat.valueOf(toFormatText.toUpperCase(Locale.ROOT));
+    } catch (IllegalArgumentException ex) {
+      throw new InvalidArgumentException(
+          String.format("Invalid '%s' argument. The schema format must be one of: %s.",
+              option.hasLongOpt()
+                  ? "--" + option.getLongOpt()
+                  : "-" + option.getOpt(),
+              Arrays.stream(SchemaFormat.values())
+                  .map(Enum::name)
+                  .collect(CustomCollectors.joiningWithOxfordComma("or"))));
+    }
+  }
+
+  @NonNull
+  public static Format getFormat(
+      @NonNull CommandLine cmdLine,
+      @NonNull Option option) throws InvalidArgumentException {
+    // use the option
+    String toFormatText = cmdLine.getOptionValue(option);
+    if (toFormatText == null) {
+      throw new IllegalArgumentException(
+          String.format("Option '%s' not provided.",
+              option.hasLongOpt()
+                  ? "--" + option.getLongOpt()
+                  : "-" + option.getOpt()));
+    }
+    try {
+      return Format.valueOf(toFormatText.toUpperCase(Locale.ROOT));
+    } catch (IllegalArgumentException ex) {
+      throw new InvalidArgumentException(
+          String.format("Invalid '%s' argument. The format must be one of: %s.",
+              option.hasLongOpt()
+                  ? "--" + option.getLongOpt()
+                  : "-" + option.getOpt(),
+              Arrays.stream(Format.values())
+                  .map(Enum::name)
+                  .collect(CustomCollectors.joiningWithOxfordComma("or"))));
+    }
+  }
+
+  /**
+   *
+   * @param cmdLine
+   * @param option
+   * @param loader
+   * @param resource
+   * @return
+   * @throws InvalidArgumentException
+   *           if the option is not a supported format
+   * @throws FileNotFoundException
+   *           if the URI is a file that was not found
+   * @throws IOException
+   *           if there was an error reading the file to determine the format of
+   *           the file
+   * @throws IllegalArgumentException
+   *           if the format of the source file was not recognized
+   * @since 2.0.0
+   */
+  @NonNull
+  public static Format determineSourceFormat(
+      @NonNull CommandLine cmdLine,
+      @NonNull Option option,
+      @NonNull IBoundLoader loader,
+      @NonNull URI resource) throws InvalidArgumentException, FileNotFoundException, IOException {
+    if (cmdLine.hasOption(option)) {
+      // use the option
+      try {
+        return getFormat(cmdLine, option);
+      } catch (IllegalArgumentException ex) {
+        throw new InvalidArgumentException(
+            String.format("Invalid '%s' argument. The format must be one of: %s.",
+                option.hasLongOpt()
+                    ? "--" + option.getLongOpt()
+                    : "-" + option.getOpt(),
+                Arrays.stream(Format.values())
+                    .map(Enum::name)
+                    .collect(CustomCollectors.joiningWithOxfordComma("or"))));
+      }
+    }
+
+    // attempt to determine the format
+    return loader.detectFormat(resource);
+  }
+
   private MetaschemaCommands() {
     // disable construction
   }
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
index 7e2eda757..6a17c1f23 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
@@ -32,10 +32,8 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -73,13 +71,13 @@ public Collection<? extends Option> gatherOptions() {
 
   @Override
   public ICommandExecutor newExecutor(CallingContext callingContext, CommandLine commandLine) {
-    return new OscalCommandExecutor(callingContext, commandLine);
+    return new CommandExecutor(callingContext, commandLine);
   }
 
-  private final class OscalCommandExecutor
+  private final class CommandExecutor
       extends AbstractValidationCommandExecutor {
 
-    private OscalCommandExecutor(
+    private CommandExecutor(
         @NonNull CallingContext callingContext,
         @NonNull CommandLine commandLine) {
       super(callingContext, commandLine);
@@ -95,15 +93,12 @@ protected IBindingContext getBindingContext(@NonNull Set<IConstraintSet> constra
     protected IModule getModule(
         CommandLine commandLine,
         IBindingContext bindingContext) throws IOException, MetaschemaException {
-
-      URI cwd = ObjectUtils.notNull(Paths.get("").toAbsolutePath().toUri());
-
       IModule module;
       try {
         module = MetaschemaCommands.handleModule(
             commandLine,
             MetaschemaCommands.METASCHEMA_REQUIRED_OPTION,
-            cwd,
+            getCurrentWorkingDirectory().toUri(),
             bindingContext);
       } catch (URISyntaxException ex) {
         throw new IOException(String.format("Cannot load module as '%s' is not a valid file or URL.", ex.getInput()),
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java
index d070890ab..859896753 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java
@@ -90,16 +90,17 @@ protected ISchemaValidationProvider getSchemaValidationProvider(
   }
 
   private static final class ValidationProvider implements ISchemaValidationProvider {
+    @SuppressWarnings("resource")
     @Override
     public XmlSchemaContentValidator getXmlSchemas(
         @NonNull URL targetResource,
         @NonNull IBindingContext bindingContext) throws IOException, SAXException {
       try (InputStream is = this.getClass().getResourceAsStream("/schema/xml/metaschema-model_schema.xsd")) {
-        List<Source> retval = new LinkedList<>();
-        retval.add(new StreamSource(
+        List<Source> sources = new LinkedList<>();
+        sources.add(new StreamSource(
             ObjectUtils.requireNonNull(is,
                 "Unable to load '/schema/xml/metaschema.xsd' on the classpath")));
-        return new XmlSchemaContentValidator(retval);
+        return new XmlSchemaContentValidator(sources);
       }
     }
 
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java
index 152750ae7..9eb0e2159 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java
@@ -153,8 +153,8 @@ protected ExitStatus executeCommand(
         String content = ObjectUtils.requireNonNull(cmdLine.getOptionValue(CONTENT_OPTION));
         URI contentResource;
         try {
-          contentResource = MetaschemaCommands.handleResource(content, cwd);
-        } catch (IOException ex) {
+          contentResource = MetaschemaCommands.handleResource(content, getCurrentWorkingDirectory().toUri());
+        } catch (URISyntaxException ex) {
           return ExitCode.INVALID_ARGUMENTS
               .exitMessage("Unable to resolve content location. " + ex.getMessage())
               .withThrowable(ex);