Added support for configuring external constraints in the maven plugin.

david-waltermire · Feb 22, 2024 · 36ee01b · 36ee01b
1 parent 36f0d75
commit 36ee01b
Show file tree

Hide file tree

Showing 10 changed files with 305 additions and 242 deletions.
diff --git a/core/metaschema b/core/metaschema
diff --git a/...va/gov/nist/secauto/metaschema/core/model/xml/ExternalConstraintsModulePostProcessor.java b/...va/gov/nist/secauto/metaschema/core/model/xml/ExternalConstraintsModulePostProcessor.java
@@ -43,8 +43,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -55,7 +55,7 @@ public class ExternalConstraintsModulePostProcessor implements IModuleLoader.IMo
   @NonNull
   private final List<IConstraintSet> registeredConstraintSets;
 
-  public ExternalConstraintsModulePostProcessor(@NonNull Set<IConstraintSet> additionalConstraintSets) {
+  public ExternalConstraintsModulePostProcessor(@NonNull Collection<IConstraintSet> additionalConstraintSets) {
     this.registeredConstraintSets = ObjectUtils.notNull(additionalConstraintSets.stream()
         .flatMap(set -> Stream.concat(
             Stream.of(set),

diff --git a/...n/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java b/...n/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java
@@ -118,8 +118,7 @@ protected IConstraintSet parseResource(@NonNull URI resource, @NonNull Deque<URI
       // now check if this constraint set imports other constraint sets
       List<MetaschemaModuleConstraints.Import> imports = CollectionUtil.listOrEmpty(obj.getImports());
 
-      @NonNull
-      Map<URI, IConstraintSet> importedConstraints;
+      @NonNull Map<URI, IConstraintSet> importedConstraints;
       if (imports.isEmpty()) {
         importedConstraints = ObjectUtils.notNull(Collections.emptyMap());
       } else {
+1 −1		.github/workflows/workflow-generate-website.yml
+1 −1		.github/workflows/workflow-validate-repo-markdown.yml
+4 −4		package-lock.json
+1 −1		package.json
+9 −0		schema/metaschema/metaschema-module-constraints.xml