More metaschema-java refactoring updates.

usnistgov · Nov 2, 2023 · 22c47f9 · 22c47f9
1 parent 089f908
commit 22c47f9
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/...v/nist/secauto/oscal/tools/cli/core/commands/oscal/AbstractOscalValidationSubcommand.java b/...v/nist/secauto/oscal/tools/cli/core/commands/oscal/AbstractOscalValidationSubcommand.java
@@ -30,6 +30,8 @@
 import gov.nist.secauto.metaschema.cli.processor.CLIProcessor.CallingContext;
 import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet;
+import gov.nist.secauto.metaschema.core.model.xml.ExternalConstraintsModulePostProcessor;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.oscal.lib.OscalBindingContext;
 
@@ -69,7 +71,16 @@ private OscalCommandExecutor(
 
     @Override
     protected IBindingContext getBindingContext(@NonNull Set<IConstraintSet> constraintSets) {
-      return constraintSets.isEmpty() ? OscalBindingContext.instance() : new OscalBindingContext(constraintSets);
+      IBindingContext retval;
+      if (constraintSets.isEmpty()) {
+        retval = OscalBindingContext.instance();
+      } else {
+        ExternalConstraintsModulePostProcessor postProcessor
+            = new ExternalConstraintsModulePostProcessor(constraintSets);
+
+        retval = new OscalBindingContext(CollectionUtil.singletonList(postProcessor));
+      }
+      return retval;
     }
 
     @Override