From 3e5e92e1df33945e3bc401771f1efaa43999bf32 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Mon, 5 Jan 2026 19:26:17 -0500 Subject: [PATCH 1/5] build: add .worktrees/ to .gitignore for isolated development --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c4847ffb..63a70dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ velocity.log* # Claude CLAUDE.local.md + +# Git worktrees +.worktrees/ From 968c5c7ae7463f99350c2171902adfa5ee296529 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Mon, 5 Jan 2026 19:48:08 -0500 Subject: [PATCH 2/5] refactor: update imports for metaschema-java package rename Update all imports from gov.nist.secauto.metaschema.* to dev.metaschema.* to align with metaschema-java PR #618. Changes: - Update metaschema-java dependency to 3.0.0-SNAPSHOT - Update all Java imports to use dev.metaschema namespace - Rename SPI service file for IFunctionLibrary BREAKING CHANGE: Requires metaschema-java 3.0.0-SNAPSHOT or later --- pom.xml | 2 +- .../secauto/oscal/lib/LibOscalVersion.java | 2 +- .../nist/secauto/oscal/lib/OscalVersion.java | 2 +- .../oscal/lib/OscalBindingContext.java | 12 ++--- .../oscal/lib/OscalModelConstants.java | 2 +- .../nist/secauto/oscal/lib/OscalUtils.java | 2 +- .../function/library/HasOscalNamespace.java | 36 +++++++-------- .../library/OscalFunctionLibrary.java | 2 +- .../function/library/ResolveProfile.java | 28 ++++++------ .../function/library/ResolveReference.java | 28 ++++++------ .../lib/model/control/AbstractParameter.java | 8 ++-- .../oscal/lib/model/control/AbstractPart.java | 12 ++--- .../oscal/lib/model/control/IPart.java | 6 +-- .../control/catalog/AbstractCatalog.java | 4 +- .../control/catalog/AbstractCatalogGroup.java | 6 +-- .../catalog/AbstractCatalogVisitor.java | 4 +- .../control/catalog/AbstractControl.java | 8 ++-- .../lib/model/metadata/AbstractLink.java | 4 +- .../lib/model/metadata/AbstractProperty.java | 6 +-- ...AllowedValueCollectingNodeItemVisitor.java | 28 ++++++------ .../profile/resolver/ModifyPhaseUtils.java | 2 +- .../lib/profile/resolver/ProfileResolver.java | 42 +++++++++--------- .../profile/resolver/alter/AddVisitor.java | 8 ++-- .../profile/resolver/alter/RemoveVisitor.java | 4 +- .../merge/FlatteningStructuringVisitor.java | 8 ++-- .../policy/AbstractCustomReferencePolicy.java | 4 +- .../AbstractMultiItemTypeReferencePolicy.java | 2 +- .../policy/AnchorReferencePolicy.java | 8 ++-- .../resolver/policy/IReferencePolicy.java | 2 +- .../resolver/policy/IReferenceVisitor.java | 2 +- .../policy/InsertReferencePolicy.java | 14 +++--- .../resolver/policy/LinkReferencePolicy.java | 10 ++--- .../policy/PatternIdentifierParser.java | 2 +- .../policy/PropertyReferencePolicy.java | 8 ++-- .../policy/ReferenceCountingVisitor.java | 26 +++++------ .../selection/ControlSelectionState.java | 10 ++--- .../selection/ControlSelectionVisitor.java | 8 ++-- .../DefaultControlSelectionFilter.java | 2 +- .../resolver/selection/DefaultResult.java | 2 +- .../selection/FilterNonSelectedVisitor.java | 8 ++-- .../resolver/selection/IControlFilter.java | 2 +- .../selection/IControlSelectionFilter.java | 2 +- .../selection/IControlSelectionState.java | 2 +- .../profile/resolver/selection/Import.java | 12 ++--- .../support/AbstractCatalogEntityVisitor.java | 12 ++--- .../support/AbstractCatalogVisitor.java | 6 +-- .../resolver/support/AbstractEntityItem.java | 4 +- .../support/AbstractIndexingVisitor.java | 6 +-- .../resolver/support/BasicIndexer.java | 14 +++--- .../support/ControlIndexingVisitor.java | 2 +- .../resolver/support/ICatalogVisitor.java | 2 +- .../profile/resolver/support/IEntityItem.java | 2 +- .../profile/resolver/support/IIndexer.java | 12 ++--- .../resolver/support/ReassignmentIndexer.java | 2 +- ...a.core.metapath.function.IFunctionLibrary} | 0 .../nist/secauto/oscal/java/ExamplesTest.java | 22 +++++----- .../oscal/java/MetaschemaVisitorTest.java | 18 ++++---- .../oscal/java/OscalBindingContextTest.java | 8 ++-- .../secauto/oscal/java/ReadWriteTest.java | 16 +++---- .../util/AbstractNodeItemVisitorTest.java | 12 ++--- ...wedValueCollectingNodeItemVisitorTest.java | 14 +++--- .../resolver/ProfileResolutionTests.java | 12 ++--- .../oscal/lib/profile/resolver/TestUtil.java | 8 ++-- .../policy/ReferenceCountingVisitorTest.java | 6 +-- .../ControlSelectionVisitorTest.java | 4 +- .../DefaultControlSelectionFilterTest.java | 2 +- .../FilterNonSelectedVisitorTest.java | 6 +-- .../resolver/selection/ImportTest.java | 14 +++--- .../ComponentDefinitionImportTest.java | 2 +- .../lib/validation/OscalValidationTest.java | 44 +++++++++---------- src/test/resources/log4j2-test.xml | 8 ++-- 71 files changed, 325 insertions(+), 325 deletions(-) rename src/main/resources/META-INF/services/{gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary => dev.metaschema.core.metapath.function.IFunctionLibrary} (100%) diff --git a/pom.xml b/pom.xml index a49fa3f4..6cb09fdd 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ UTF-8 UTF-8 - 3.0.0.M1 + 3.0.0-SNAPSHOT 3.20.0 2.13.1 diff --git a/src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java b/src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java index e1cc94c9..d4e31b26 100644 --- a/src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java +++ b/src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; /** * Provides version information for this library. diff --git a/src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java b/src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java index 0e6139fe..adec7d67 100644 --- a/src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java +++ b/src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; /** * Provides version information for the underlying OSCAL implementation used by this library. diff --git a/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java b/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java index 5cf77b98..2bb2781f 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java @@ -5,12 +5,12 @@ package gov.nist.secauto.oscal.lib; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.DefaultBindingContext; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.SimpleModuleLoaderStrategy; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.SimpleModuleLoaderStrategy; import gov.nist.secauto.oscal.lib.model.AssessmentPlan; import gov.nist.secauto.oscal.lib.model.AssessmentResults; import gov.nist.secauto.oscal.lib.model.Catalog; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java b/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java index a8aebafc..2900628d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java b/src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java index 8ccc6e01..8e34a378 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java index dce11acc..768ea1cf 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java @@ -5,24 +5,24 @@ package gov.nist.secauto.oscal.lib.metapath.function.library; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.model.metadata.IProperty; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java index 164baa46..84ba74c0 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.metapath.function.library; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary; +import dev.metaschema.core.metapath.function.FunctionLibrary; public class OscalFunctionLibrary extends FunctionLibrary { diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java index 2eda734d..1e78b9a3 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java @@ -5,20 +5,20 @@ package gov.nist.secauto.oscal.lib.metapath.function.library; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.function.DocumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnDoc; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnResolveUri; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.DocumentFunctionException; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.library.FnDoc; +import dev.metaschema.core.metapath.function.library.FnResolveUri; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java index 808f2c5d..57124d47 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java @@ -5,20 +5,20 @@ package gov.nist.secauto.oscal.lib.metapath.function.library; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.UnidentifiedFunctionError; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnRoot; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.function.UnidentifiedFunctionError; +import dev.metaschema.core.metapath.function.library.FnRoot; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.IUuidItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.OscalUtils; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java index 476349d8..0492f6bf 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.model.control; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Link; import gov.nist.secauto.oscal.lib.model.Parameter; import gov.nist.secauto.oscal.lib.model.ParameterConstraint; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java index 631f882d..13b1e4eb 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java @@ -5,12 +5,12 @@ package gov.nist.secauto.oscal.lib.model.control; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.ControlPart; import gov.nist.secauto.oscal.lib.model.Link; import gov.nist.secauto.oscal.lib.model.Property; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java index b76a7017..8ce40e66 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java @@ -5,9 +5,9 @@ package gov.nist.secauto.oscal.lib.model.control; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; import gov.nist.secauto.oscal.lib.model.ControlPart; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java index cdd52771..fe6d93cf 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java @@ -5,8 +5,8 @@ package gov.nist.secauto.oscal.lib.model.control.catalog; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.AbstractOscalInstance; import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java index 324d995b..f4b53921 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java @@ -5,9 +5,9 @@ package gov.nist.secauto.oscal.lib.model.control.catalog; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; import gov.nist.secauto.oscal.lib.model.ControlPart; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java index c52ecded..d54914cd 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java @@ -5,8 +5,8 @@ package gov.nist.secauto.oscal.lib.model.control.catalog; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java index a80fbe6d..419a9e3d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.model.control.catalog; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.IDeserializationHandler; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.IDeserializationHandler; import gov.nist.secauto.oscal.lib.model.Control; import gov.nist.secauto.oscal.lib.model.ControlPart; import gov.nist.secauto.oscal.lib.model.Link; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java b/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java index e4506cfd..a05011fd 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java @@ -5,8 +5,8 @@ package gov.nist.secauto.oscal.lib.model.metadata; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Link; import java.net.URI; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java b/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java index 3f8f79e6..5543ee1b 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java @@ -5,9 +5,9 @@ package gov.nist.secauto.oscal.lib.model.metadata; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Property; import java.net.URI; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java index 15bd590c..046581f7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java @@ -5,20 +5,20 @@ package gov.nist.secauto.oscal.lib.model.util; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.AbstractRecursionPreventingNodeItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.AbstractRecursionPreventingNodeItemVisitor; +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ILet; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java index d3ff969d..a6b2d075 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java index 9603396a..0399da60 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java @@ -5,27 +5,27 @@ package gov.nist.secauto.oscal.lib.profile.resolver; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IDocumentLoader; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IDocumentLoader; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.OscalUtils; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java index 65fd0331..641b67ca 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.profile.resolver.alter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -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 dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java index e40c5f80..c3912a68 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java @@ -5,8 +5,8 @@ package gov.nist.secauto.oscal.lib.profile.resolver.alter; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java index 4df4053b..7d20a4e1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.profile.resolver.merge; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java index c91197d7..2282bd69 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java @@ -5,8 +5,8 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java index 60d6d61b..2cb1036f 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java index 0ee2230f..ae6cc14a 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java @@ -9,10 +9,10 @@ import com.vladsch.flexmark.util.sequence.BasedSequence; import com.vladsch.flexmark.util.sequence.CharSubSequence; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java index 04dca5bd..796069aa 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java index 2f03739f..560ac09e 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java index 5447c556..34c02b0d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java @@ -7,13 +7,13 @@ import com.vladsch.flexmark.util.sequence.BasedSequence; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -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 dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java index 94118f51..8cfdba3f 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java @@ -5,11 +5,11 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -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 dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Link; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java index 573ac520..53fa70c3 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import java.util.Objects; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java index bfe0cf56..ecbbafbb 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Property; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java index a9498869..de627316 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java @@ -8,19 +8,19 @@ import com.vladsch.flexmark.ast.InlineLinkNode; import com.vladsch.flexmark.util.ast.Node; -import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.IMarkupString; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.atomic.IMarkupItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.model.CatalogGroup; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java index 5fb646cd..8d44443e 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java @@ -5,11 +5,11 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java index 642cc453..eac4b3e7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java index 91c42187..c0603a69 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.ProfileMatching; import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; import gov.nist.secauto.oscal.lib.model.control.profile.IProfileSelectControlById; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java index fd4a749d..bc7d69c1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java index 83506e5d..028c6290 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.model.BackMatter; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java index 32d581f3..9b63f83d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.IncludeAll; import gov.nist.secauto.oscal.lib.model.ProfileImport; import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java index 108de6d8..4fcdfeb1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java index 065ca1b7..24909a98 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java index 84b37161..b07ae96b 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java @@ -8,12 +8,12 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.util.VersionUtil; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.BackMatter; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; import gov.nist.secauto.oscal.lib.model.Catalog; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java index 1697c9d8..be21682a 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java @@ -5,12 +5,12 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.OscalModelConstants; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java index fd82f7ee..ac6c56db 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java @@ -5,9 +5,9 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalModelConstants; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java index bce0c5f0..ca7a5a05 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java @@ -5,8 +5,8 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java index 7c5bbcf4..4a9fc5a4 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java @@ -5,9 +5,9 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.EnumSet; import java.util.Set; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java index 64d4cec0..b6b591b7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java @@ -5,13 +5,13 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.datatype.adapter.UuidAdapter; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression.ResultType; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.UuidAdapter; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.IMetapathExpression.ResultType; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; import gov.nist.secauto.oscal.lib.model.CatalogGroup; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java index 41a3db96..e1eac5de 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; import java.util.Set; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java index 554e9630..c4430e1e 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java index a1706e78..3c69d79b 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; import java.net.URI; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java index 13d5d5e6..d9849c1d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java @@ -5,12 +5,12 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression.ResultType; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.IMetapathExpression.ResultType; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.metadata.IProperty; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java index 731896d6..f704c636 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java +++ b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java @@ -5,7 +5,7 @@ package gov.nist.secauto.oscal.lib.profile.resolver.support; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary b/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary similarity index 100% rename from src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary rename to src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary diff --git a/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java b/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java index 8ae41cc4..2933f079 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java +++ b/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java @@ -8,17 +8,17 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationException; -import gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator; -import gov.nist.secauto.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.io.ISerializer; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.DefaultConstraintValidator; +import dev.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.ISerializer; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; diff --git a/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java b/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java index a4b9bec6..d5ea7eac 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java +++ b/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java @@ -5,15 +5,15 @@ package gov.nist.secauto.oscal.java; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationException; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.IBoundLoader; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.metapath.function.library.ResolveProfile; diff --git a/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java b/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java index eef01c1d..bbd7574d 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java +++ b/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java @@ -8,10 +8,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.io.ISerializer; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.ISerializer; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.Profile; diff --git a/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java b/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java index fce6a2ea..c749d042 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java +++ b/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java @@ -7,14 +7,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.DefaultBindingContext; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IDeserializer; -import gov.nist.secauto.metaschema.databind.io.ISerializer; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; +import dev.metaschema.databind.io.ISerializer; import gov.nist.secauto.oscal.lib.model.Catalog; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java b/src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java index 21bf4b43..6b1f7219 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java @@ -5,12 +5,12 @@ package gov.nist.secauto.oscal.lib.model.util; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundModule; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.OscalCompleteModule; import gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.AllowedValuesRecord; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java b/src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java index 11be0862..11b26b0d 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java @@ -7,13 +7,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.metaschema.BindingConstraintLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; import gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.NodeItemRecord; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java index 444f6c57..bcceac96 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java @@ -11,12 +11,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.DefaultBoundLoader; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.ISerializer; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.DefaultBoundLoader; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.ISerializer; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.profile.resolver.selection.ImportCycleException; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java index 0b00d4c4..35c50b1d 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java @@ -5,10 +5,10 @@ package gov.nist.secauto.oscal.lib.profile.resolver; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java index db9d9b03..c4483716 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java @@ -5,9 +5,9 @@ package gov.nist.secauto.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.databind.io.Format; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.databind.io.Format; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.profile.resolver.TestUtil; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java index 53501ca7..671eaad2 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.CatalogGroup; import gov.nist.secauto.oscal.lib.model.Control; import gov.nist.secauto.oscal.lib.model.control.catalog.IControlContainer; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java index 12c4e448..83c2e8c0 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import gov.nist.secauto.oscal.lib.model.ProfileMatching; import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; import gov.nist.secauto.oscal.lib.model.control.profile.IProfileSelectControlById; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java index 5ca6a5aa..f7e561db 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java @@ -7,9 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.databind.io.Format; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.databind.io.Format; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.Catalog; import gov.nist.secauto.oscal.lib.model.CatalogGroup; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java index 8e8e938e..11616b43 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java @@ -5,13 +5,13 @@ package gov.nist.secauto.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.OscalModelConstants; import gov.nist.secauto.oscal.lib.model.Catalog; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java b/src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java index 47d4473b..49ef9c31 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.model.validation.IValidationResult; import gov.nist.secauto.oscal.lib.OscalBindingContext; import gov.nist.secauto.oscal.lib.model.ComponentDefinition; import gov.nist.secauto.oscal.lib.model.IOscalInstance; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java b/src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java index 9e829032..70b76059 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java +++ b/src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java @@ -8,28 +8,28 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationException; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.AbstractValidationResultProcessor; -import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.IValidationResult; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.IBindingContext.ISchemaValidationProvider; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.validation.AbstractValidationResultProcessor; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.ISchemaGenerator; +import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; +import dev.metaschema.schemagen.SchemaGenerationFeature; import gov.nist.secauto.oscal.lib.OscalBindingContext; import org.apache.logging.log4j.LogManager; diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml index e347850b..2b0513a5 100644 --- a/src/test/resources/log4j2-test.xml +++ b/src/test/resources/log4j2-test.xml @@ -10,17 +10,17 @@ - + - + - + - + From da2c77dfed01a50a20142d51c173261602535b91 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Mon, 5 Jan 2026 23:08:57 -0500 Subject: [PATCH 3/5] refactor!: rename packages from gov.nist.secauto.oscal to dev.metaschema.oscal Rename all Java packages to align with the dev.metaschema namespace: - gov.nist.secauto.oscal.lib -> dev.metaschema.oscal.lib - gov.nist.secauto.oscal.java -> dev.metaschema.oscal.lib (consolidated) BREAKING CHANGE: All Java packages have been renamed. Downstream projects must update their imports from gov.nist.secauto.oscal.* to dev.metaschema.oscal.* --- pom.xml | 2 +- .../oscal/lib/LibOscalVersion.java | 2 +- .../metaschema}/oscal/lib/OscalVersion.java | 2 +- .../oscal/lib/OscalBindingContext.java | 18 ++--- .../oscal/lib/OscalModelConstants.java | 2 +- .../metaschema}/oscal/lib/OscalUtils.java | 6 +- .../function/library/HasOscalNamespace.java | 6 +- .../library/OscalFunctionLibrary.java | 2 +- .../function/library/ResolveProfile.java | 10 +-- .../function/library/ResolveReference.java | 12 ++-- .../lib/model/AbstractOscalInstance.java | 6 +- .../oscal/lib/model/IOscalInstance.java | 4 +- .../lib/model/control/AbstractParameter.java | 16 ++--- .../oscal/lib/model/control/AbstractPart.java | 8 +-- .../oscal/lib/model/control/IParameter.java | 6 +- .../oscal/lib/model/control/IPart.java | 4 +- .../control/catalog/AbstractCatalog.java | 6 +- .../control/catalog/AbstractCatalogGroup.java | 16 ++--- .../catalog/AbstractCatalogVisitor.java | 10 +-- .../control/catalog/AbstractControl.java | 14 ++-- .../lib/model/control/catalog/ICatalog.java | 2 +- .../model/control/catalog/ICatalogGroup.java | 4 +- .../control/catalog/ICatalogVisitor.java | 10 +-- .../lib/model/control/catalog/IControl.java | 6 +- .../control/catalog/IControlContainer.java | 6 +- .../control/catalog/IGroupContainer.java | 4 +- .../AbstractProfileSelectControlById.java | 6 +- .../profile/IProfileSelectControlById.java | 4 +- .../model/metadata/AbstractBackMatter.java | 4 +- .../lib/model/metadata/AbstractLink.java | 4 +- .../lib/model/metadata/AbstractMetadata.java | 4 +- .../lib/model/metadata/AbstractProperty.java | 4 +- .../oscal/lib/model/metadata/IBackMatter.java | 4 +- .../oscal/lib/model/metadata/ILink.java | 2 +- .../oscal/lib/model/metadata/IMetadata.java | 8 +-- .../oscal/lib/model/metadata/IProperty.java | 2 +- ...AllowedValueCollectingNodeItemVisitor.java | 2 +- .../profile/resolver/ModifyPhaseUtils.java | 2 +- .../ProfileResolutionEvaluationException.java | 2 +- .../resolver/ProfileResolutionException.java | 2 +- .../lib/profile/resolver/ProfileResolver.java | 66 +++++++++---------- .../profile/resolver/alter/AddVisitor.java | 20 +++--- .../profile/resolver/alter/RemoveVisitor.java | 22 +++---- .../profile/resolver/alter/package-info.java | 2 +- .../merge/FlatteningStructuringVisitor.java | 36 +++++----- .../profile/resolver/merge/package-info.java | 2 +- .../policy/AbstractCustomReferencePolicy.java | 6 +- .../AbstractIndexMissPolicyHandler.java | 4 +- .../AbstractMultiItemTypeReferencePolicy.java | 4 +- .../policy/AnchorReferencePolicy.java | 4 +- .../policy/ICustomReferencePolicy.java | 2 +- .../policy/ICustomReferencePolicyHandler.java | 4 +- .../resolver/policy/IIdentifierParser.java | 4 +- .../resolver/policy/IReferencePolicy.java | 4 +- .../resolver/policy/IReferenceVisitor.java | 10 +-- .../policy/InsertReferencePolicy.java | 4 +- .../resolver/policy/LinkReferencePolicy.java | 6 +- .../policy/PatternIdentifierParser.java | 4 +- .../policy/PropertyReferencePolicy.java | 6 +- .../policy/ReferenceCountingVisitor.java | 28 ++++---- .../selection/ControlSelectionState.java | 10 +-- .../selection/ControlSelectionVisitor.java | 18 ++--- .../DefaultControlSelectionFilter.java | 10 +-- .../resolver/selection/DefaultResult.java | 10 +-- .../selection/FilterNonSelectedVisitor.java | 36 +++++----- .../resolver/selection/IControlFilter.java | 10 +-- .../selection/IControlSelectionFilter.java | 4 +- .../selection/IControlSelectionState.java | 4 +- .../profile/resolver/selection/IResult.java | 10 +-- .../profile/resolver/selection/Import.java | 40 +++++------ .../selection/ImportCycleException.java | 2 +- .../resolver/selection}/package-info.java | 2 +- .../support/AbstractCatalogEntityVisitor.java | 6 +- .../support/AbstractCatalogVisitor.java | 4 +- .../resolver/support/AbstractEntityItem.java | 2 +- .../support/AbstractIndexingVisitor.java | 2 +- .../resolver/support/BasicIndexer.java | 24 +++---- .../support/ControlIndexingVisitor.java | 4 +- .../resolver/support/ICatalogVisitor.java | 2 +- .../profile/resolver/support/IEntityItem.java | 2 +- .../resolver/support/IIdentifierMapper.java | 2 +- .../profile/resolver/support/IIndexer.java | 8 +-- .../resolver/support/ReassignmentIndexer.java | 4 +- .../resolver/support}/package-info.java | 2 +- .../oscal-metaschema-bindings.xml | 40 +++++------ ...ma.core.metapath.function.IFunctionLibrary | 2 +- .../metaschema/oscal/lib}/ExamplesTest.java | 10 +-- .../oscal/lib}/MetaschemaVisitorTest.java | 6 +- .../oscal/lib}/OscalBindingContextTest.java | 10 +-- .../metaschema/oscal/lib}/ReadWriteTest.java | 4 +- .../util/AbstractNodeItemVisitorTest.java | 8 +-- ...wedValueCollectingNodeItemVisitorTest.java | 4 +- .../resolver/ModifyPhaseUtilsTest.java | 2 +- .../resolver/ProfileResolutionTests.java | 8 +-- .../oscal/lib/profile/resolver/TestUtil.java | 20 +++--- .../policy/ReferenceCountingVisitorTest.java | 24 +++---- .../ControlSelectionVisitorTest.java | 16 ++--- .../DefaultControlSelectionFilterTest.java | 8 +-- .../FilterNonSelectedVisitorTest.java | 22 +++---- .../resolver/selection/ImportTest.java | 20 +++--- .../ComponentDefinitionImportTest.java | 12 ++-- .../lib/validation/OscalValidationTest.java | 4 +- src/test/resources/log4j2-test.xml | 2 +- 103 files changed, 456 insertions(+), 456 deletions(-) rename src/main/java-templates/{gov/nist/secauto => dev/metaschema}/oscal/lib/LibOscalVersion.java (97%) rename src/main/java-templates/{gov/nist/secauto => dev/metaschema}/oscal/lib/OscalVersion.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/OscalBindingContext.java (92%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/OscalModelConstants.java (98%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/OscalUtils.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/metapath/function/library/HasOscalNamespace.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/metapath/function/library/OscalFunctionLibrary.java (93%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/metapath/function/library/ResolveProfile.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/metapath/function/library/ResolveReference.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/AbstractOscalInstance.java (74%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/IOscalInstance.java (84%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/AbstractParameter.java (92%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/AbstractPart.java (95%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/IParameter.java (67%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/IPart.java (86%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/AbstractCatalog.java (79%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/AbstractCatalogGroup.java (91%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java (92%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/AbstractControl.java (92%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/ICatalog.java (73%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/ICatalogGroup.java (63%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/ICatalogVisitor.java (84%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/IControl.java (63%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/IControlContainer.java (90%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/catalog/IGroupContainer.java (87%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java (90%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/control/profile/IProfileSelectControlById.java (68%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/AbstractBackMatter.java (84%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/AbstractLink.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/AbstractMetadata.java (84%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/AbstractProperty.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/IBackMatter.java (75%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/ILink.java (71%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/IMetadata.java (64%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/metadata/IProperty.java (93%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java (99%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/ModifyPhaseUtils.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java (92%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/ProfileResolutionException.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/ProfileResolver.java (93%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/alter/AddVisitor.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/alter/RemoveVisitor.java (95%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/alter/package-info.java (56%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java (86%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/merge/package-info.java (56%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java (79%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java (85%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java (96%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java (95%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/IIdentifierParser.java (91%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/IReferencePolicy.java (91%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/IReferenceVisitor.java (91%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java (95%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java (95%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java (92%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java (96%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/ControlSelectionState.java (93%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java (90%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java (93%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/DefaultResult.java (95%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java (89%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/IControlFilter.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java (93%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/IControlSelectionState.java (71%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/IResult.java (59%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/Import.java (85%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/ImportCycleException.java (92%) rename src/main/java/{gov/nist/secauto/oscal/lib/profile/resolver/support => dev/metaschema/oscal/lib/profile/resolver/selection}/package-info.java (55%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java (98%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/AbstractEntityItem.java (98%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java (97%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/BasicIndexer.java (94%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java (87%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/ICatalogVisitor.java (96%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/IEntityItem.java (96%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/IIdentifierMapper.java (96%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/IIndexer.java (96%) rename src/main/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/support/ReassignmentIndexer.java (89%) rename src/main/java/{gov/nist/secauto/oscal/lib/profile/resolver/selection => dev/metaschema/oscal/lib/profile/resolver/support}/package-info.java (54%) rename src/test/java/{gov/nist/secauto/oscal/java => dev/metaschema/oscal/lib}/ExamplesTest.java (92%) rename src/test/java/{gov/nist/secauto/oscal/java => dev/metaschema/oscal/lib}/MetaschemaVisitorTest.java (96%) rename src/test/java/{gov/nist/secauto/oscal/java => dev/metaschema/oscal/lib}/OscalBindingContextTest.java (96%) rename src/test/java/{gov/nist/secauto/oscal/java => dev/metaschema/oscal/lib}/ReadWriteTest.java (98%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/util/AbstractNodeItemVisitorTest.java (93%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java (95%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java (97%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/ProfileResolutionTests.java (97%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/TestUtil.java (89%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java (65%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java (78%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java (97%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java (78%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/profile/resolver/selection/ImportTest.java (83%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/validation/ComponentDefinitionImportTest.java (89%) rename src/test/java/{gov/nist/secauto => dev/metaschema}/oscal/lib/validation/OscalValidationTest.java (98%) diff --git a/pom.xml b/pom.xml index 6cb09fdd..5f117b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ dev.metaschema.oscal liboscal-java - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT jar OSCAL Java Library diff --git a/src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java b/src/main/java-templates/dev/metaschema/oscal/lib/LibOscalVersion.java similarity index 97% rename from src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java rename to src/main/java-templates/dev/metaschema/oscal/lib/LibOscalVersion.java index d4e31b26..89498827 100644 --- a/src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java +++ b/src/main/java-templates/dev/metaschema/oscal/lib/LibOscalVersion.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.oscal.lib; import dev.metaschema.core.util.IVersionInfo; diff --git a/src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java b/src/main/java-templates/dev/metaschema/oscal/lib/OscalVersion.java similarity index 97% rename from src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java rename to src/main/java-templates/dev/metaschema/oscal/lib/OscalVersion.java index adec7d67..57e2ad54 100644 --- a/src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java +++ b/src/main/java-templates/dev/metaschema/oscal/lib/OscalVersion.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.oscal.lib; import dev.metaschema.core.util.IVersionInfo; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java b/src/main/java/dev/metaschema/oscal/lib/OscalBindingContext.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java rename to src/main/java/dev/metaschema/oscal/lib/OscalBindingContext.java index 2bb2781f..30ef9e1a 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java +++ b/src/main/java/dev/metaschema/oscal/lib/OscalBindingContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.oscal.lib; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.MetaschemaException; @@ -11,14 +11,14 @@ import dev.metaschema.databind.DefaultBindingContext; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.SimpleModuleLoaderStrategy; -import gov.nist.secauto.oscal.lib.model.AssessmentPlan; -import gov.nist.secauto.oscal.lib.model.AssessmentResults; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.ComponentDefinition; -import gov.nist.secauto.oscal.lib.model.OscalCompleteModule; -import gov.nist.secauto.oscal.lib.model.PlanOfActionAndMilestones; -import gov.nist.secauto.oscal.lib.model.Profile; -import gov.nist.secauto.oscal.lib.model.SystemSecurityPlan; +import dev.metaschema.oscal.lib.model.AssessmentPlan; +import dev.metaschema.oscal.lib.model.AssessmentResults; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.ComponentDefinition; +import dev.metaschema.oscal.lib.model.OscalCompleteModule; +import dev.metaschema.oscal.lib.model.PlanOfActionAndMilestones; +import dev.metaschema.oscal.lib.model.Profile; +import dev.metaschema.oscal.lib.model.SystemSecurityPlan; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java b/src/main/java/dev/metaschema/oscal/lib/OscalModelConstants.java similarity index 98% rename from src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java rename to src/main/java/dev/metaschema/oscal/lib/OscalModelConstants.java index 2900628d..601e89a9 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java +++ b/src/main/java/dev/metaschema/oscal/lib/OscalModelConstants.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.oscal.lib; import dev.metaschema.core.qname.IEnhancedQName; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java b/src/main/java/dev/metaschema/oscal/lib/OscalUtils.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java rename to src/main/java/dev/metaschema/oscal/lib/OscalUtils.java index 8e34a378..b34fce11 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java +++ b/src/main/java/dev/metaschema/oscal/lib/OscalUtils.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.oscal.lib; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.BackMatter.Resource.Rlink; import java.net.URI; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/HasOscalNamespace.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java rename to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/HasOscalNamespace.java index 768ea1cf..45aab815 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java +++ b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/HasOscalNamespace.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.metapath.function.library; +package dev.metaschema.oscal.lib.metapath.function.library; import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; @@ -23,8 +23,8 @@ import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.model.metadata.IProperty; import java.net.URI; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/OscalFunctionLibrary.java similarity index 93% rename from src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java rename to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/OscalFunctionLibrary.java index 84ba74c0..4be6089c 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java +++ b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/OscalFunctionLibrary.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.metapath.function.library; +package dev.metaschema.oscal.lib.metapath.function.library; import dev.metaschema.core.metapath.function.FunctionLibrary; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveProfile.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java rename to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveProfile.java index 1e78b9a3..f09787a1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java +++ b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveProfile.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.metapath.function.library; +package dev.metaschema.oscal.lib.metapath.function.library; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; @@ -19,10 +19,10 @@ import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java rename to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java index 57124d47..a963582c 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveReference.java +++ b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.metapath.function.library; +package dev.metaschema.oscal.lib.metapath.function.library; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -19,11 +19,11 @@ import dev.metaschema.core.metapath.item.atomic.IUuidItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.OscalUtils; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink; -import gov.nist.secauto.oscal.lib.model.IOscalInstance; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.OscalUtils; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.BackMatter.Resource.Rlink; +import dev.metaschema.oscal.lib.model.IOscalInstance; import java.net.URI; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/AbstractOscalInstance.java b/src/main/java/dev/metaschema/oscal/lib/model/AbstractOscalInstance.java similarity index 74% rename from src/main/java/gov/nist/secauto/oscal/lib/model/AbstractOscalInstance.java rename to src/main/java/dev/metaschema/oscal/lib/model/AbstractOscalInstance.java index 7d9f5845..a191018c 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/AbstractOscalInstance.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/AbstractOscalInstance.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model; +package dev.metaschema.oscal.lib.model; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.metadata.IBackMatter; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.metadata.IBackMatter; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/IOscalInstance.java b/src/main/java/dev/metaschema/oscal/lib/model/IOscalInstance.java similarity index 84% rename from src/main/java/gov/nist/secauto/oscal/lib/model/IOscalInstance.java rename to src/main/java/dev/metaschema/oscal/lib/model/IOscalInstance.java index 44d0496a..22635c82 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/IOscalInstance.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/IOscalInstance.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model; +package dev.metaschema.oscal.lib.model; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java b/src/main/java/dev/metaschema/oscal/lib/model/control/AbstractParameter.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/AbstractParameter.java index 0492f6bf..4fbbb75d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractParameter.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/AbstractParameter.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control; +package dev.metaschema.oscal.lib.model.control; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.ParameterConstraint; -import gov.nist.secauto.oscal.lib.model.ParameterGuideline; -import gov.nist.secauto.oscal.lib.model.ParameterSelection; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.ParameterConstraint; +import dev.metaschema.oscal.lib.model.ParameterGuideline; +import dev.metaschema.oscal.lib.model.ParameterSelection; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.metadata.IProperty; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java b/src/main/java/dev/metaschema/oscal/lib/model/control/AbstractPart.java similarity index 95% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/AbstractPart.java index 13b1e4eb..e6c922d1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/AbstractPart.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/AbstractPart.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control; +package dev.metaschema.oscal.lib.model.control; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -11,9 +11,9 @@ import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Property; import java.net.URI; import java.util.LinkedList; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/IParameter.java b/src/main/java/dev/metaschema/oscal/lib/model/control/IParameter.java similarity index 67% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/IParameter.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/IParameter.java index 71cf06d9..23b6a9b7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/IParameter.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/IParameter.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control; +package dev.metaschema.oscal.lib.model.control; -import gov.nist.secauto.oscal.lib.model.ParameterSelection; -import gov.nist.secauto.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.ParameterSelection; +import dev.metaschema.oscal.lib.model.Property; import java.util.List; import java.util.stream.Stream; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java b/src/main/java/dev/metaschema/oscal/lib/model/control/IPart.java similarity index 86% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/IPart.java index 8ce40e66..20f5f0cd 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/IPart.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/IPart.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control; +package dev.metaschema.oscal.lib.model.control; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.ControlPart; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalog.java similarity index 79% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalog.java index fe6d93cf..4ad1b4f1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalog.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalog.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.AbstractOscalInstance; -import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; +import dev.metaschema.oscal.lib.model.AbstractOscalInstance; +import dev.metaschema.oscal.lib.model.control.AbstractParameter; import java.util.stream.Stream; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalogGroup.java similarity index 91% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalogGroup.java index f4b53921..c69c126f 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogGroup.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalogGroup.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.control.AbstractParameter; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java index d54914cd..f3692570 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractCatalogVisitor.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Parameter; import java.util.Objects; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractControl.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractControl.java index 419a9e3d..5f0d20e0 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/AbstractControl.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/AbstractControl.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.IDeserializationHandler; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.control.AbstractParameter; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalog.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalog.java similarity index 73% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalog.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalog.java index f1a68890..bc50d075 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalog.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalog.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; public interface ICatalog extends IGroupContainer { // no additional methods diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalogGroup.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalogGroup.java similarity index 63% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalogGroup.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalogGroup.java index eb782c2d..85d75727 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalogGroup.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalogGroup.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; -import gov.nist.secauto.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.ControlPart; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalogVisitor.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalogVisitor.java similarity index 84% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalogVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalogVisitor.java index 857aaffb..614088bb 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/ICatalogVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/ICatalogVisitor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Parameter; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IControl.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IControl.java similarity index 63% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IControl.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IControl.java index 81c77942..12a34eb7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IControl.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IControl.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IControlContainer.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IControlContainer.java similarity index 90% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IControlContainer.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IControlContainer.java index c9fa8ead..bc4508af 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IControlContainer.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IControlContainer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Parameter; import java.util.List; import java.util.stream.Stream; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IGroupContainer.java b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IGroupContainer.java similarity index 87% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IGroupContainer.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IGroupContainer.java index fd00b4a8..0905dfa4 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/catalog/IGroupContainer.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/catalog/IGroupContainer.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.catalog; +package dev.metaschema.oscal.lib.model.control.catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.CatalogGroup; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java b/src/main/java/dev/metaschema/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java similarity index 90% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java index 051327c7..d7032524 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/profile/AbstractProfileSelectControlById.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.profile; +package dev.metaschema.oscal.lib.model.control.profile; -import gov.nist.secauto.oscal.lib.model.ProfileMatching; -import gov.nist.secauto.oscal.lib.model.ProfileSelectControlById; +import dev.metaschema.oscal.lib.model.ProfileMatching; +import dev.metaschema.oscal.lib.model.ProfileSelectControlById; import java.util.Collection; import java.util.LinkedList; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/control/profile/IProfileSelectControlById.java b/src/main/java/dev/metaschema/oscal/lib/model/control/profile/IProfileSelectControlById.java similarity index 68% rename from src/main/java/gov/nist/secauto/oscal/lib/model/control/profile/IProfileSelectControlById.java rename to src/main/java/dev/metaschema/oscal/lib/model/control/profile/IProfileSelectControlById.java index b16e3c37..b14f20b8 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/control/profile/IProfileSelectControlById.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/control/profile/IProfileSelectControlById.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.control.profile; +package dev.metaschema.oscal.lib.model.control.profile; -import gov.nist.secauto.oscal.lib.model.ProfileMatching; +import dev.metaschema.oscal.lib.model.ProfileMatching; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractBackMatter.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractBackMatter.java similarity index 84% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractBackMatter.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractBackMatter.java index b036fd63..1c367476 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractBackMatter.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractBackMatter.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; import java.util.List; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractLink.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractLink.java index a05011fd..b346c5d5 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractLink.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractLink.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Link; import java.net.URI; import java.util.LinkedList; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractMetadata.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractMetadata.java similarity index 84% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractMetadata.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractMetadata.java index 4339cecc..d7699f2c 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractMetadata.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractMetadata.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Party; import java.util.List; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractProperty.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractProperty.java index 5543ee1b..998613ed 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/AbstractProperty.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/AbstractProperty.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.Property; import java.net.URI; import java.util.LinkedList; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IBackMatter.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/IBackMatter.java similarity index 75% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IBackMatter.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/IBackMatter.java index 86826b86..4223c2ee 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IBackMatter.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/IBackMatter.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; import java.util.List; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/ILink.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/ILink.java similarity index 71% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/ILink.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/ILink.java index c8cea401..90afac69 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/ILink.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/ILink.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; public interface ILink { // no additional methods diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IMetadata.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/IMetadata.java similarity index 64% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IMetadata.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/IMetadata.java index c0b74a85..581fcbb3 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IMetadata.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/IMetadata.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; -import gov.nist.secauto.oscal.lib.model.Metadata.Location; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; -import gov.nist.secauto.oscal.lib.model.Metadata.Role; +import dev.metaschema.oscal.lib.model.Metadata.Location; +import dev.metaschema.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Role; import java.util.List; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IProperty.java b/src/main/java/dev/metaschema/oscal/lib/model/metadata/IProperty.java similarity index 93% rename from src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IProperty.java rename to src/main/java/dev/metaschema/oscal/lib/model/metadata/IProperty.java index ff11253c..612d098a 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/metadata/IProperty.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/metadata/IProperty.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.metadata; +package dev.metaschema.oscal.lib.model.metadata; import java.net.URI; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java b/src/main/java/dev/metaschema/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java similarity index 99% rename from src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java index 046581f7..107fd7a7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.util; +package dev.metaschema.oscal.lib.model.util; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtils.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtils.java index a6b2d075..5d72e5f1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtils.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; import dev.metaschema.core.util.CollectionUtil; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java index c8fa7ed5..6f1c3b0a 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionEvaluationException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; public class ProfileResolutionEvaluationException extends IllegalStateException { diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionException.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionException.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionException.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionException.java index 6a3e3da8..3569399b 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionException.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java similarity index 93% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java index 0399da60..8b24ca9e 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IDocumentLoader; @@ -26,38 +26,38 @@ import dev.metaschema.databind.io.DeserializationFeature; import dev.metaschema.databind.io.IBoundLoader; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.OscalUtils; -import gov.nist.secauto.oscal.lib.model.BackMatter; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Base64; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Merge; -import gov.nist.secauto.oscal.lib.model.Metadata; -import gov.nist.secauto.oscal.lib.model.Metadata.Location; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; -import gov.nist.secauto.oscal.lib.model.Metadata.Role; -import gov.nist.secauto.oscal.lib.model.Modify; -import gov.nist.secauto.oscal.lib.model.Modify.ProfileSetParameter; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.Profile; -import gov.nist.secauto.oscal.lib.model.ProfileImport; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.metadata.AbstractLink; -import gov.nist.secauto.oscal.lib.model.metadata.AbstractProperty; -import gov.nist.secauto.oscal.lib.profile.resolver.alter.AddVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.alter.RemoveVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.merge.FlatteningStructuringVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.Import; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.ImportCycleException; -import gov.nist.secauto.oscal.lib.profile.resolver.support.BasicIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.ControlIndexingVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.OscalUtils; +import dev.metaschema.oscal.lib.model.BackMatter; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.BackMatter.Resource.Base64; +import dev.metaschema.oscal.lib.model.BackMatter.Resource.Rlink; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Merge; +import dev.metaschema.oscal.lib.model.Metadata; +import dev.metaschema.oscal.lib.model.Metadata.Location; +import dev.metaschema.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Role; +import dev.metaschema.oscal.lib.model.Modify; +import dev.metaschema.oscal.lib.model.Modify.ProfileSetParameter; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Profile; +import dev.metaschema.oscal.lib.model.ProfileImport; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.metadata.AbstractLink; +import dev.metaschema.oscal.lib.model.metadata.AbstractProperty; +import dev.metaschema.oscal.lib.profile.resolver.alter.AddVisitor; +import dev.metaschema.oscal.lib.profile.resolver.alter.RemoveVisitor; +import dev.metaschema.oscal.lib.profile.resolver.merge.FlatteningStructuringVisitor; +import dev.metaschema.oscal.lib.profile.resolver.selection.Import; +import dev.metaschema.oscal.lib.profile.resolver.selection.ImportCycleException; +import dev.metaschema.oscal.lib.profile.resolver.support.BasicIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.ControlIndexingVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java index 641b67ca..8869fb15 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/AddVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.alter; +package dev.metaschema.oscal.lib.profile.resolver.alter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.control.catalog.ICatalogVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.control.catalog.ICatalogVisitor; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import java.util.Collections; import java.util.EnumMap; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/RemoveVisitor.java similarity index 95% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/RemoveVisitor.java index c3912a68..409c1572 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/RemoveVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/RemoveVisitor.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.alter; +package dev.metaschema.oscal.lib.profile.resolver.alter; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.control.catalog.ICatalogVisitor; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.control.catalog.ICatalogVisitor; +import dev.metaschema.oscal.lib.model.metadata.IProperty; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/package-info.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/package-info.java similarity index 56% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/package-info.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/package-info.java index 8aee976e..31456e16 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/alter/package-info.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.alter; +package dev.metaschema.oscal.lib.profile.resolver.alter; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java similarity index 86% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java index 7d20a4e1..4f9b07bc 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/merge/FlatteningStructuringVisitor.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.merge; +package dev.metaschema.oscal.lib.profile.resolver.merge; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Metadata.Location; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; -import gov.nist.secauto.oscal.lib.model.Metadata.Role; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver; -import gov.nist.secauto.oscal.lib.profile.resolver.policy.ReferenceCountingVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.DefaultResult; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.FilterNonSelectedVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.AbstractCatalogEntityVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Metadata.Location; +import dev.metaschema.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Role; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver; +import dev.metaschema.oscal.lib.profile.resolver.policy.ReferenceCountingVisitor; +import dev.metaschema.oscal.lib.profile.resolver.selection.DefaultResult; +import dev.metaschema.oscal.lib.profile.resolver.selection.FilterNonSelectedVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.AbstractCatalogEntityVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; import java.util.EnumSet; import java.util.UUID; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/package-info.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/merge/package-info.java similarity index 56% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/package-info.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/merge/package-info.java index c0594b73..829fa1c1 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/merge/package-info.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/merge/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.merge; +package dev.metaschema.oscal.lib.profile.resolver.merge; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java index 2282bd69..146046f8 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractCustomReferencePolicy.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java similarity index 79% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java index fd816976..010b60b5 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractIndexMissPolicyHandler.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java similarity index 85% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java index 2cb1036f..0130b7f8 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AbstractMultiItemTypeReferencePolicy.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java similarity index 96% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java index ae6cc14a..6178d89d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/AnchorReferencePolicy.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import com.vladsch.flexmark.ast.InlineLinkNode; import com.vladsch.flexmark.util.sequence.BasedSequence; @@ -13,7 +13,7 @@ import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java index e22109fb..614e7d86 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ICustomReferencePolicy.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java similarity index 95% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java index ef4c5e95..41862e9d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ICustomReferencePolicyHandler.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import java.util.List; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IIdentifierParser.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IIdentifierParser.java similarity index 91% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IIdentifierParser.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IIdentifierParser.java index 9c8aa9fe..17a088af 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IIdentifierParser.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IIdentifierParser.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IReferencePolicy.java similarity index 91% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IReferencePolicy.java index 796069aa..ecb3a083 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IReferencePolicy.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IReferenceVisitor.java similarity index 91% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IReferenceVisitor.java index 560ac09e..cbb21e64 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/IReferenceVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/IReferenceVisitor.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; -import gov.nist.secauto.oscal.lib.profile.resolver.support.ICatalogVisitor; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.profile.resolver.support.ICatalogVisitor; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java similarity index 95% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java index 34c02b0d..395cecc9 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/InsertReferencePolicy.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import com.vladsch.flexmark.util.sequence.BasedSequence; @@ -14,7 +14,7 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java similarity index 95% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java index 8cfdba3f..b22086e9 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/LinkReferencePolicy.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java index 53fa70c3..35240822 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/PatternIdentifierParser.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import java.util.Objects; import java.util.regex.Matcher; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java index ecbbafbb..715a6b48 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/PropertyReferencePolicy.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java similarity index 96% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java index de627316..bf41ac33 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/policy/ReferenceCountingVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import com.vladsch.flexmark.ast.InlineLinkNode; import com.vladsch.flexmark.util.ast.Node; @@ -21,19 +21,19 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.model.metadata.AbstractProperty; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver.UriResolver; -import gov.nist.secauto.oscal.lib.profile.resolver.support.AbstractCatalogEntityVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Link; +import dev.metaschema.oscal.lib.model.Property; +import dev.metaschema.oscal.lib.model.metadata.AbstractProperty; +import dev.metaschema.oscal.lib.model.metadata.IProperty; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver.UriResolver; +import dev.metaschema.oscal.lib.profile.resolver.support.AbstractCatalogEntityVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionState.java similarity index 93% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionState.java index 8d44443e..431cd52d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionState.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionState.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java similarity index 90% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java index eac4b3e7..5803be4e 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionVisitor.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.profile.resolver.support.AbstractIndexingVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.profile.resolver.support.AbstractIndexingVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java similarity index 93% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java index c0603a69..6b73b96e 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.ProfileMatching; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; -import gov.nist.secauto.oscal.lib.model.control.profile.IProfileSelectControlById; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.model.ProfileMatching; +import dev.metaschema.oscal.lib.model.control.catalog.IControl; +import dev.metaschema.oscal.lib.model.control.profile.IProfileSelectControlById; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultResult.java similarity index 95% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultResult.java index bc7d69c1..92440a4f 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultResult.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultResult.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Parameter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java similarity index 89% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java index 028c6290..aa3699c0 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitor.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.model.BackMatter; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Metadata; -import gov.nist.secauto.oscal.lib.model.Metadata.Location; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; -import gov.nist.secauto.oscal.lib.model.Metadata.Role; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.profile.resolver.support.AbstractCatalogEntityVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.model.BackMatter; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Metadata; +import dev.metaschema.oscal.lib.model.Metadata.Location; +import dev.metaschema.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Role; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.profile.resolver.support.AbstractCatalogEntityVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java index 9b63f83d..8e4b7783 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlFilter.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.IncludeAll; -import gov.nist.secauto.oscal.lib.model.ProfileImport; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; -import gov.nist.secauto.oscal.lib.model.control.profile.IProfileSelectControlById; +import dev.metaschema.oscal.lib.model.IncludeAll; +import dev.metaschema.oscal.lib.model.ProfileImport; +import dev.metaschema.oscal.lib.model.control.catalog.IControl; +import dev.metaschema.oscal.lib.model.control.profile.IProfileSelectControlById; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java similarity index 93% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java index 4fcdfeb1..3efe2351 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlSelectionFilter.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; +import dev.metaschema.oscal.lib.model.control.catalog.IControl; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlSelectionState.java similarity index 71% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlSelectionState.java index 24909a98..0d9f7945 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IControlSelectionState.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlSelectionState.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IResult.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IResult.java similarity index 59% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IResult.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IResult.java index c701c2d1..d7e25ce5 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/IResult.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IResult.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Parameter; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java similarity index 85% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java index b07ae96b..02fde495 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/Import.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.util.VersionUtil; @@ -14,25 +14,25 @@ import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.BackMatter; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.Metadata; -import gov.nist.secauto.oscal.lib.model.Metadata.Location; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; -import gov.nist.secauto.oscal.lib.model.Metadata.Role; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.model.ProfileImport; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver.UriResolver; -import gov.nist.secauto.oscal.lib.profile.resolver.policy.ReferenceCountingVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.BasicIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; +import dev.metaschema.oscal.lib.model.BackMatter; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.Metadata; +import dev.metaschema.oscal.lib.model.Metadata.Location; +import dev.metaschema.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Role; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.model.ProfileImport; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver.UriResolver; +import dev.metaschema.oscal.lib.profile.resolver.policy.ReferenceCountingVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.BasicIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer.SelectionStatus; import java.net.URI; import java.util.LinkedList; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportCycleException.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ImportCycleException.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportCycleException.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ImportCycleException.java index 23abc509..7a6dc6a9 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportCycleException.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/ImportCycleException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; public class ImportCycleException extends Exception { diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/package-info.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/package-info.java similarity index 55% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/package-info.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/package-info.java index 6ae267f3..97126b5d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/package-info.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.selection; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java similarity index 98% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java index be21682a..604b7484 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractCatalogEntityVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -11,8 +11,8 @@ import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.OscalModelConstants; import java.util.Collections; import java.util.EnumSet; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java index ac6c56db..3ff437d7 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractCatalogVisitor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.OscalModelConstants; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractEntityItem.java similarity index 98% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractEntityItem.java index ca7a5a05..622d60d6 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractEntityItem.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractEntityItem.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.util.ObjectUtils; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java similarity index 97% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java index 4a9fc5a4..bc6a4a57 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/BasicIndexer.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/BasicIndexer.java index b6b591b7..6886080f 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/BasicIndexer.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/BasicIndexer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.datatype.adapter.UuidAdapter; import dev.metaschema.core.metapath.IMetapathExpression; @@ -12,17 +12,17 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.BackMatter.Resource; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Metadata.Location; -import gov.nist.secauto.oscal.lib.model.Metadata.Party; -import gov.nist.secauto.oscal.lib.model.Metadata.Role; -import gov.nist.secauto.oscal.lib.model.Parameter; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.BackMatter.Resource; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.ControlPart; +import dev.metaschema.oscal.lib.model.Metadata.Location; +import dev.metaschema.oscal.lib.model.Metadata.Party; +import dev.metaschema.oscal.lib.model.Metadata.Role; +import dev.metaschema.oscal.lib.model.Parameter; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java similarity index 87% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java index e1eac5de..3a0972f0 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ControlIndexingVisitor.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; import java.util.Set; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ICatalogVisitor.java similarity index 96% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ICatalogVisitor.java index c4430e1e..00af1815 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ICatalogVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ICatalogVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IEntityItem.java similarity index 96% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IEntityItem.java index 3c69d79b..fb2ce855 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IEntityItem.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IEntityItem.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IModelNodeItem; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIdentifierMapper.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IIdentifierMapper.java similarity index 96% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIdentifierMapper.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IIdentifierMapper.java index 55da74ff..481e406d 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIdentifierMapper.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IIdentifierMapper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IIndexer.java similarity index 96% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IIndexer.java index d9849c1d..b26ff066 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/IIndexer.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/IIndexer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.IMetapathExpression.ResultType; @@ -11,9 +11,9 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.metadata.IProperty; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ReassignmentIndexer.java similarity index 89% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ReassignmentIndexer.java index f704c636..3a6f6bd9 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/support/ReassignmentIndexer.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/ReassignmentIndexer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.oscal.lib.profile.resolver.support; import dev.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem.ItemType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/package-info.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/package-info.java similarity index 54% rename from src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/package-info.java rename to src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/package-info.java index 98bb2b3c..a8fb5f98 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/package-info.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/support/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.support; diff --git a/src/main/metaschema-bindings/oscal-metaschema-bindings.xml b/src/main/metaschema-bindings/oscal-metaschema-bindings.xml index 27fcdc6f..bf79625a 100644 --- a/src/main/metaschema-bindings/oscal-metaschema-bindings.xml +++ b/src/main/metaschema-bindings/oscal-metaschema-bindings.xml @@ -4,29 +4,29 @@ - gov.nist.secauto.oscal.lib.model + dev.metaschema.oscal.lib.model - gov.nist.secauto.oscal.lib.model.metadata.AbstractProperty + dev.metaschema.oscal.lib.model.metadata.AbstractProperty - gov.nist.secauto.oscal.lib.model.metadata.AbstractLink + dev.metaschema.oscal.lib.model.metadata.AbstractLink - gov.nist.secauto.oscal.lib.model.metadata.AbstractBackMatter + dev.metaschema.oscal.lib.model.metadata.AbstractBackMatter - gov.nist.secauto.oscal.lib.model.metadata.AbstractMetadata + dev.metaschema.oscal.lib.model.metadata.AbstractMetadata @@ -47,13 +47,13 @@ href="../../../oscal/src/metaschema/oscal_control-common_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.control.AbstractParameter + dev.metaschema.oscal.lib.model.control.AbstractParameter ControlPart - gov.nist.secauto.oscal.lib.model.control.AbstractPart + dev.metaschema.oscal.lib.model.control.AbstractPart @@ -61,19 +61,19 @@ href="../../../oscal/src/metaschema/oscal_catalog_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.control.catalog.AbstractCatalog + dev.metaschema.oscal.lib.model.control.catalog.AbstractCatalog CatalogGroup - gov.nist.secauto.oscal.lib.model.control.catalog.AbstractCatalogGroup + dev.metaschema.oscal.lib.model.control.catalog.AbstractCatalogGroup Control - gov.nist.secauto.oscal.lib.model.control.catalog.AbstractControl + dev.metaschema.oscal.lib.model.control.catalog.AbstractControl @@ -81,7 +81,7 @@ href="../../../oscal/src/metaschema/oscal_profile_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance @@ -97,7 +97,7 @@ ProfileSelectControlById - gov.nist.secauto.oscal.lib.model.control.profile.AbstractProfileSelectControlById + dev.metaschema.oscal.lib.model.control.profile.AbstractProfileSelectControlById @@ -115,12 +115,12 @@ href="../../../oscal/src/metaschema/oscal_component_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance ComponentData @@ -133,7 +133,7 @@ ComponentControlImplementation - + @@ -146,7 +146,7 @@ href="../../../oscal/src/metaschema/oscal_ssp_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance @@ -154,7 +154,7 @@ href="../../../oscal/src/metaschema/oscal_poam_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance @@ -162,7 +162,7 @@ href="../../../oscal/src/metaschema/oscal_assessment-plan_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance @@ -170,7 +170,7 @@ href="../../../oscal/src/metaschema/oscal_assessment-results_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance @@ -178,7 +178,7 @@ href="../../../oscal/src/metaschema/oscal_mapping_metaschema.xml"> - gov.nist.secauto.oscal.lib.model.AbstractOscalInstance + dev.metaschema.oscal.lib.model.AbstractOscalInstance diff --git a/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary b/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary index 9b1f3c21..9944ae1f 100644 --- a/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary +++ b/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary @@ -1 +1 @@ -gov.nist.secauto.oscal.lib.metapath.function.library.OscalFunctionLibrary +dev.metaschema.oscal.lib.metapath.function.library.OscalFunctionLibrary diff --git a/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java b/src/test/java/dev/metaschema/oscal/lib/ExamplesTest.java similarity index 92% rename from src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java rename to src/test/java/dev/metaschema/oscal/lib/ExamplesTest.java index 2933f079..887ca637 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/ExamplesTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.java; +package dev.metaschema.oscal.lib; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -19,10 +19,10 @@ import dev.metaschema.databind.io.Format; import dev.metaschema.databind.io.IBoundLoader; import dev.metaschema.databind.io.ISerializer; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java b/src/test/java/dev/metaschema/oscal/lib/MetaschemaVisitorTest.java similarity index 96% rename from src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/MetaschemaVisitorTest.java index d5ea7eac..c850af93 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/MetaschemaVisitorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.java; +package dev.metaschema.oscal.lib; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; @@ -14,8 +14,8 @@ import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.metapath.function.library.ResolveProfile; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.metapath.function.library.ResolveProfile; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java b/src/test/java/dev/metaschema/oscal/lib/OscalBindingContextTest.java similarity index 96% rename from src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java rename to src/test/java/dev/metaschema/oscal/lib/OscalBindingContextTest.java index bbd7574d..df522174 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/OscalBindingContextTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.java; +package dev.metaschema.oscal.lib; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -12,10 +12,10 @@ import dev.metaschema.databind.io.Format; import dev.metaschema.databind.io.IBoundLoader; import dev.metaschema.databind.io.ISerializer; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.Profile; -import gov.nist.secauto.oscal.lib.model.SystemSecurityPlan; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.Profile; +import dev.metaschema.oscal.lib.model.SystemSecurityPlan; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java b/src/test/java/dev/metaschema/oscal/lib/ReadWriteTest.java similarity index 98% rename from src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java rename to src/test/java/dev/metaschema/oscal/lib/ReadWriteTest.java index c749d042..4b08a4e9 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/ReadWriteTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.java; +package dev.metaschema.oscal.lib; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -15,7 +15,7 @@ import dev.metaschema.databind.io.Format; import dev.metaschema.databind.io.IDeserializer; import dev.metaschema.databind.io.ISerializer; -import gov.nist.secauto.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.Catalog; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java b/src/test/java/dev/metaschema/oscal/lib/model/util/AbstractNodeItemVisitorTest.java similarity index 93% rename from src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/model/util/AbstractNodeItemVisitorTest.java index 6b1f7219..8ca1eef4 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AbstractNodeItemVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/model/util/AbstractNodeItemVisitorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.util; +package dev.metaschema.oscal.lib.model.util; import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import dev.metaschema.core.model.MetaschemaException; @@ -11,9 +11,9 @@ import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.OscalCompleteModule; -import gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.AllowedValuesRecord; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.OscalCompleteModule; +import dev.metaschema.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.AllowedValuesRecord; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java b/src/test/java/dev/metaschema/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java similarity index 95% rename from src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java index 11b26b0d..62735456 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/model/util/AllowedValueCollectingNodeItemVisitorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.util; +package dev.metaschema.oscal.lib.model.util; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -14,7 +14,7 @@ import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.NodeItemRecord; +import dev.metaschema.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.NodeItemRecord; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java similarity index 97% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java index 921b0e96..9a91db1a 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtilsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionTests.java similarity index 97% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionTests.java index bcceac96..5825024c 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolutionTests.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolutionTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,9 +17,9 @@ import dev.metaschema.databind.io.DefaultBoundLoader; import dev.metaschema.databind.io.Format; import dev.metaschema.databind.io.ISerializer; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.ImportCycleException; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.profile.resolver.selection.ImportCycleException; import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.SaxonApiException; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/TestUtil.java similarity index 89% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/TestUtil.java index 35c50b1d..bdf9efc5 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/TestUtil.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/TestUtil.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.oscal.lib.profile.resolver; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.INodeItemFactory; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; -import gov.nist.secauto.oscal.lib.model.control.AbstractPart; -import gov.nist.secauto.oscal.lib.model.control.catalog.AbstractCatalogGroup; -import gov.nist.secauto.oscal.lib.model.control.catalog.AbstractControl; -import gov.nist.secauto.oscal.lib.model.metadata.AbstractProperty; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIdentifierMapper; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.control.AbstractParameter; +import dev.metaschema.oscal.lib.model.control.AbstractPart; +import dev.metaschema.oscal.lib.model.control.catalog.AbstractCatalogGroup; +import dev.metaschema.oscal.lib.model.control.catalog.AbstractControl; +import dev.metaschema.oscal.lib.model.metadata.AbstractProperty; +import dev.metaschema.oscal.lib.model.metadata.IProperty; +import dev.metaschema.oscal.lib.profile.resolver.support.IIdentifierMapper; import java.nio.file.Paths; import java.util.Map; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java similarity index 65% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java index c4483716..3f2d2c23 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/policy/ReferenceCountingVisitorTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.policy; +package dev.metaschema.oscal.lib.profile.resolver.policy; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.databind.io.Format; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.profile.resolver.TestUtil; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.ControlSelectionState; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.ControlSelectionVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.IControlFilter; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.IControlSelectionFilter; -import gov.nist.secauto.oscal.lib.profile.resolver.selection.IControlSelectionState; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIdentifierMapper; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.ReassignmentIndexer; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.profile.resolver.TestUtil; +import dev.metaschema.oscal.lib.profile.resolver.selection.ControlSelectionState; +import dev.metaschema.oscal.lib.profile.resolver.selection.ControlSelectionVisitor; +import dev.metaschema.oscal.lib.profile.resolver.selection.IControlFilter; +import dev.metaschema.oscal.lib.profile.resolver.selection.IControlSelectionFilter; +import dev.metaschema.oscal.lib.profile.resolver.selection.IControlSelectionState; +import dev.metaschema.oscal.lib.profile.resolver.support.IIdentifierMapper; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.ReassignmentIndexer; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java similarity index 78% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java index 671eaad2..0f4de67e 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/ControlSelectionVisitorTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import static org.junit.jupiter.api.Assertions.assertEquals; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControlContainer; -import gov.nist.secauto.oscal.lib.profile.resolver.TestUtil; -import gov.nist.secauto.oscal.lib.profile.resolver.support.BasicIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.control.catalog.IControlContainer; +import dev.metaschema.oscal.lib.profile.resolver.TestUtil; +import dev.metaschema.oscal.lib.profile.resolver.support.BasicIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java similarity index 97% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java index 83c2e8c0..3e71d167 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/DefaultControlSelectionFilterTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import dev.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.ProfileMatching; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; -import gov.nist.secauto.oscal.lib.model.control.profile.IProfileSelectControlById; +import dev.metaschema.oscal.lib.model.ProfileMatching; +import dev.metaschema.oscal.lib.model.control.catalog.IControl; +import dev.metaschema.oscal.lib.model.control.profile.IProfileSelectControlById; import org.apache.commons.lang3.tuple.Pair; import org.jmock.Expectations; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java similarity index 78% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java index f7e561db..511176bd 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/FilterNonSelectedVisitorTest.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import static org.junit.jupiter.api.Assertions.assertEquals; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.databind.io.Format; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.CatalogGroup; -import gov.nist.secauto.oscal.lib.model.Control; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControlContainer; -import gov.nist.secauto.oscal.lib.profile.resolver.TestUtil; -import gov.nist.secauto.oscal.lib.profile.resolver.policy.ReferenceCountingVisitor; -import gov.nist.secauto.oscal.lib.profile.resolver.support.BasicIndexer; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.CatalogGroup; +import dev.metaschema.oscal.lib.model.Control; +import dev.metaschema.oscal.lib.model.control.catalog.IControlContainer; +import dev.metaschema.oscal.lib.profile.resolver.TestUtil; +import dev.metaschema.oscal.lib.profile.resolver.policy.ReferenceCountingVisitor; +import dev.metaschema.oscal.lib.profile.resolver.support.BasicIndexer; +import dev.metaschema.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.oscal.lib.profile.resolver.support.IIndexer; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/ImportTest.java similarity index 83% rename from src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java rename to src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/ImportTest.java index 11616b43..9af65636 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/profile/resolver/selection/ImportTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/profile/resolver/selection/ImportTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.selection; +package dev.metaschema.oscal.lib.profile.resolver.selection; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; @@ -12,15 +12,15 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.IncludeAll; -import gov.nist.secauto.oscal.lib.model.Profile; -import gov.nist.secauto.oscal.lib.model.ProfileImport; -import gov.nist.secauto.oscal.lib.model.control.catalog.AbstractControl; -import gov.nist.secauto.oscal.lib.model.control.profile.AbstractProfileSelectControlById; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.OscalModelConstants; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.IncludeAll; +import dev.metaschema.oscal.lib.model.Profile; +import dev.metaschema.oscal.lib.model.ProfileImport; +import dev.metaschema.oscal.lib.model.control.catalog.AbstractControl; +import dev.metaschema.oscal.lib.model.control.profile.AbstractProfileSelectControlById; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java b/src/test/java/dev/metaschema/oscal/lib/validation/ComponentDefinitionImportTest.java similarity index 89% rename from src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java rename to src/test/java/dev/metaschema/oscal/lib/validation/ComponentDefinitionImportTest.java index 49ef9c31..34d66881 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/validation/ComponentDefinitionImportTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/validation/ComponentDefinitionImportTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.validation; +package dev.metaschema.oscal.lib.validation; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import dev.metaschema.core.model.validation.IValidationResult; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.ComponentDefinition; -import gov.nist.secauto.oscal.lib.model.IOscalInstance; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.ComponentDefinition; +import dev.metaschema.oscal.lib.model.IOscalInstance; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,8 +57,8 @@ void testComponentDefinitionImplementsIOscalInstance() throws IOException { * import-component-definitions does not throw a ClassCastException. * * Previously (issue #192), this would fail with: ClassCastException: class - * gov.nist.secauto.oscal.lib.model.ComponentDefinition cannot be cast to class - * gov.nist.secauto.oscal.lib.model.IOscalInstance + * dev.metaschema.oscal.lib.model.ComponentDefinition cannot be cast to class + * dev.metaschema.oscal.lib.model.IOscalInstance */ @Test void testValidateComponentDefinitionWithImport() { diff --git a/src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java b/src/test/java/dev/metaschema/oscal/lib/validation/OscalValidationTest.java similarity index 98% rename from src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java rename to src/test/java/dev/metaschema/oscal/lib/validation/OscalValidationTest.java index 70b76059..0bec7a8a 100644 --- a/src/test/java/gov/nist/secauto/oscal/lib/validation/OscalValidationTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/validation/OscalValidationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.validation; +package dev.metaschema.oscal.lib.validation; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,7 +30,7 @@ import dev.metaschema.schemagen.ISchemaGenerator; import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; import dev.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.OscalBindingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml index 2b0513a5..7a519115 100644 --- a/src/test/resources/log4j2-test.xml +++ b/src/test/resources/log4j2-test.xml @@ -24,7 +24,7 @@ - + From f1d56cfd0d67e754f05461b9e59aebe3442f8ff2 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Tue, 6 Jan 2026 14:52:15 -0500 Subject: [PATCH 4/5] chore: remove unused dependencies and update versions - Remove xmlresolver and xmlbeans dependencies (not used directly) - Update log4j2 from 2.25.2 to 2.25.3 (dependency convergence) - Update Saxon from 12.9 to 12.5 (align with metaschema-java) --- pom.xml | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 5f117b4d..de422a63 100644 --- a/pom.xml +++ b/pom.xml @@ -98,10 +98,8 @@ 3.20.0 2.13.1 2.0.3 - 2.25.2 - 12.9 - 5.3.0 - 6.0.19 + 2.25.3 + 12.5 2.11.0 2.9.1 @@ -170,36 +168,6 @@ import pom - - org.xmlresolver - xmlresolver - ${dependency.xmlresolver.version} - data - - - - xml-apis - xml-apis - - - - - org.xmlresolver - xmlresolver - ${dependency.xmlresolver.version} - - - - xml-apis - xml-apis - - - - - org.apache.xmlbeans - xmlbeans - ${dependency.xmlbeans.version} - org.junit From bf30195ca63da48aa95c1419c734f2a7ce7a3fd2 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Tue, 6 Jan 2026 15:02:01 -0500 Subject: [PATCH 5/5] fix: resolve SpotBugs warnings for redundant null checks - Remove redundant null check in ResolveReference (getHref is @NonNull) - Use Boolean.TRUE.equals() in ProfileResolver to avoid double evaluation - Remove redundant null checks in AddVisitor for lazy-initialized collections - Change null checks to isEmpty checks in IControlFilter - Simplify generateMetadata in Import (getMetadata is @NonNull) --- .../function/library/ResolveReference.java | 7 +--- .../lib/profile/resolver/ProfileResolver.java | 2 +- .../profile/resolver/alter/AddVisitor.java | 34 ------------------- .../resolver/selection/IControlFilter.java | 12 +++---- .../profile/resolver/selection/Import.java | 7 +--- 5 files changed, 9 insertions(+), 53 deletions(-) diff --git a/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java index a963582c..2c0287e1 100644 --- a/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java +++ b/src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveReference.java @@ -179,11 +179,6 @@ public static URI resolveReference( throw new UnidentifiedFunctionError( String.format("The backmatter resource '%s' does not have an rlink entry.", reference)); } - URI retval = rLink.getHref(); - if (retval == null) { - throw new UnidentifiedFunctionError( - String.format("The backmatter resource '%s' has an rlink with a null href value.", reference)); - } - return retval; + return rLink.getHref(); } } diff --git a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java index 8b24ca9e..6cdf6f96 100644 --- a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/ProfileResolver.java @@ -493,7 +493,7 @@ private static StructuringDirective getStructuringDirective(Profile profile) { StructuringDirective retval; if (merge == null) { retval = StructuringDirective.FLAT; - } else if (merge.getAsIs() != null && merge.getAsIs()) { + } else if (Boolean.TRUE.equals(merge.getAsIs())) { retval = StructuringDirective.AS_IS; } else if (merge.getCustom() != null) { retval = StructuringDirective.CUSTOM; diff --git a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java index 8869fb15..305b65cb 100644 --- a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/alter/AddVisitor.java @@ -400,22 +400,6 @@ private static boolean handleChild( public Boolean visitControl(Control control, Context context) { assert context != null; - if (control.getParams() == null) { - control.setParams(new LinkedList<>()); - } - - if (control.getProps() == null) { - control.setProps(new LinkedList<>()); - } - - if (control.getLinks() == null) { - control.setLinks(new LinkedList<>()); - } - - if (control.getParts() == null) { - control.setParts(new LinkedList<>()); - } - boolean retval = handleCurrent( control, control::setTitle, @@ -454,13 +438,6 @@ public Boolean visitControl(Control control, Context context) { @Override public Boolean visitParameter(Parameter parameter, Context context) { assert context != null; - if (parameter.getProps() == null) { - parameter.setProps(new LinkedList<>()); - } - - if (parameter.getLinks() == null) { - parameter.setLinks(new LinkedList<>()); - } return handleCurrent( parameter, @@ -483,17 +460,6 @@ public Boolean visitParameter(Parameter parameter, Context context) { */ public boolean visitPart(ControlPart part, Context context) { assert context != null; - if (part.getProps() == null) { - part.setProps(new LinkedList<>()); - } - - if (part.getLinks() == null) { - part.setLinks(new LinkedList<>()); - } - - if (part.getParts() == null) { - part.setParts(new LinkedList<>()); - } boolean retval = handleCurrent( part, diff --git a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java index 8e4b7783..326ea8e0 100644 --- a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/IControlFilter.java @@ -128,21 +128,21 @@ public Filter(@NonNull ProfileImport profileImport) { IncludeAll includeAll = profileImport.getIncludeAll(); if (includeAll == null) { - List selections = profileImport.getIncludeControls(); - if (selections == null) { + List includeSelections = profileImport.getIncludeControls(); + if (includeSelections.isEmpty()) { this.inclusionFilter = IControlSelectionFilter.NONE_MATCH; } else { - this.inclusionFilter = new DefaultControlSelectionFilter(selections); + this.inclusionFilter = new DefaultControlSelectionFilter(includeSelections); } } else { this.inclusionFilter = IControlSelectionFilter.ALL_MATCH; } - List selections = profileImport.getExcludeControls(); - if (selections == null) { + List excludeSelections = profileImport.getExcludeControls(); + if (excludeSelections.isEmpty()) { this.exclusionFilter = IControlSelectionFilter.NONE_MATCH; } else { - this.exclusionFilter = new DefaultControlSelectionFilter(selections); + this.exclusionFilter = new DefaultControlSelectionFilter(excludeSelections); } } diff --git a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java index 02fde495..50879333 100644 --- a/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java +++ b/src/main/java/dev/metaschema/oscal/lib/profile/resolver/selection/Import.java @@ -145,12 +145,7 @@ private static void generateMetadata( Metadata importedMetadata = toCatalog(importedCatalogDocument).getMetadata(); if (importedMetadata != null) { - Metadata resolvedMetadata = resolvedCatalog.getMetadata(); - if (resolvedMetadata == null) { - resolvedMetadata = new Metadata(); - resolvedCatalog.setMetadata(resolvedMetadata); - } - resolveMetadata(importedMetadata, resolvedMetadata, indexer); + resolveMetadata(importedMetadata, resolvedCatalog.getMetadata(), indexer); } }