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/ diff --git a/pom.xml b/pom.xml index a49fa3f4..de422a63 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 @@ -93,15 +93,13 @@ UTF-8 UTF-8 - 3.0.0.M1 + 3.0.0-SNAPSHOT 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 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 92% 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 e1cc94c9..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,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.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/dev/metaschema/oscal/lib/OscalVersion.java similarity index 92% 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 0e6139fe..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,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.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/dev/metaschema/oscal/lib/OscalBindingContext.java similarity index 87% rename from src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java rename to src/main/java/dev/metaschema/oscal/lib/OscalBindingContext.java index 5cf77b98..30ef9e1a 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java +++ b/src/main/java/dev/metaschema/oscal/lib/OscalBindingContext.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +package dev.metaschema.oscal.lib; + +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 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 95% rename from src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java rename to src/main/java/dev/metaschema/oscal/lib/OscalModelConstants.java index a8aebafc..601e89a9 100644 --- a/src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java +++ b/src/main/java/dev/metaschema/oscal/lib/OscalModelConstants.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib; +package dev.metaschema.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/dev/metaschema/oscal/lib/OscalUtils.java similarity index 92% rename from src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java rename to src/main/java/dev/metaschema/oscal/lib/OscalUtils.java index 8ccc6e01..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 gov.nist.secauto.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.core.util.ObjectUtils; +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 81% 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 dce11acc..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,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 gov.nist.secauto.oscal.lib.OscalModelConstants; -import gov.nist.secauto.oscal.lib.model.metadata.IProperty; +package dev.metaschema.oscal.lib.metapath.function.library; + +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 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 86% 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 164baa46..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,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.metapath.function.library; +package dev.metaschema.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/dev/metaschema/oscal/lib/metapath/function/library/ResolveProfile.java similarity index 77% 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 2eda734d..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,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +package dev.metaschema.oscal.lib.metapath.function.library; + +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 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 76% 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 808f2c5d..2c0287e1 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,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +package dev.metaschema.oscal.lib.metapath.function.library; + +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 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; @@ -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/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 87% 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 476349d8..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; - -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 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; +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 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 85% 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 631f882d..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,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 gov.nist.secauto.oscal.lib.model.ControlPart; -import gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.model.Property; +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.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 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 53% 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 b76a7017..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 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.oscal.lib.model.ControlPart; +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.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 67% 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 cdd52771..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 gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.AbstractOscalInstance; -import gov.nist.secauto.oscal.lib.model.control.AbstractParameter; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +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 87% 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 324d995b..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; - -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.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; +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.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 88% 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 c52ecded..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 gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.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.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +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 87% 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 a80fbe6d..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; - -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 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; +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 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 88% 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 e4506cfd..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 gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.Link; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.util.ObjectUtils; +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 91% 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 3f8f79e6..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 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.oscal.lib.model.Property; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +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 82% 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 15bd590c..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,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -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; +package dev.metaschema.oscal.lib.model.util; + +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/dev/metaschema/oscal/lib/profile/resolver/ModifyPhaseUtils.java similarity index 95% 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 d3ff969d..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,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver; +package dev.metaschema.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/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 88% 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 9603396a..6cdf6f96 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,61 +3,61 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +package dev.metaschema.oscal.lib.profile.resolver; + +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 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; @@ -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/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 93% 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 65fd0331..305b65cb 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; - -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 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; +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 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; @@ -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/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 94% 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 e40c5f80..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; - -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.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; +package dev.metaschema.oscal.lib.profile.resolver.alter; + +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +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 83% 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 4df4053b..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; - -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 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; +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 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 96% 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 c91197d7..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 gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.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.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.util.ObjectUtils; +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 78% 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 60d6d61b..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 gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +import dev.metaschema.core.util.CollectionUtil; +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 89% 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 0ee2230f..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,17 +3,17 @@ * 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; 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 gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +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 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 86% 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 04dca5bd..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 gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +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 89% 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 2f03739f..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 gov.nist.secauto.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.core.metapath.item.node.IAssemblyNodeItem; +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 76% 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 5447c556..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,18 +3,18 @@ * 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; -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 gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +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 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 86% 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 94118f51..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; - -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 gov.nist.secauto.oscal.lib.model.Link; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +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 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 89% 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 573ac520..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 gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionEvaluationException; +import dev.metaschema.core.util.ObjectUtils; +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 86% 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 bfe0cf56..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 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 gov.nist.secauto.oscal.lib.model.Property; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem; +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 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 92% 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 a9498869..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,37 +3,37 @@ * 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; -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 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.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 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 85% 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 5fb646cd..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; - -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 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; +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 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 85% 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 642cc453..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; - -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 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; +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 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 92% 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 91c42187..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 gov.nist.secauto.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.core.util.ObjectUtils; +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 94% 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 fd4a749d..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 gov.nist.secauto.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.core.util.ObjectUtils; +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 87% 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 83506e5d..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; - -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 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; +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 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 88% 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 32d581f3..326ea8e0 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 gov.nist.secauto.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.core.util.ObjectUtils; +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; @@ -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/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 90% 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 108de6d8..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 gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.model.control.catalog.IControl; +import dev.metaschema.core.util.ObjectUtils; +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 56% 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 065ca1b7..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 gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IIndexer; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +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 77% 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 84b37161..50879333 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,36 +3,36 @@ * 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; -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 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.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 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; @@ -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); } } 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 94% 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 1697c9d8..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,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.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 gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.OscalModelConstants; +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 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 93% 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 fd82f7ee..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 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 gov.nist.secauto.oscal.lib.OscalModelConstants; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.util.ObjectUtils; +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 95% 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 bce0c5f0..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,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 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/dev/metaschema/oscal/lib/profile/resolver/support/AbstractIndexingVisitor.java similarity index 87% 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 7c5bbcf4..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,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.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/dev/metaschema/oscal/lib/profile/resolver/support/BasicIndexer.java similarity index 91% 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 64d4cec0..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,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +package dev.metaschema.oscal.lib.profile.resolver.support; + +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 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 80% 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 41a3db96..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 gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +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 92% 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 554e9630..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,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.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/dev/metaschema/oscal/lib/profile/resolver/support/IEntityItem.java similarity index 93% 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 a1706e78..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,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.profile.resolver.support; +package dev.metaschema.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/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 91% 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 13d5d5e6..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,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +package dev.metaschema.oscal.lib.profile.resolver.support; + +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 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 84% 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 731896d6..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 gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.oscal.lib.profile.resolver.support.IEntityItem.ItemType; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +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 new file mode 100644 index 00000000..9944ae1f --- /dev/null +++ b/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary @@ -0,0 +1 @@ +dev.metaschema.oscal.lib.metapath.function.library.OscalFunctionLibrary diff --git a/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary b/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary deleted file mode 100644 index 9b1f3c21..00000000 --- a/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary +++ /dev/null @@ -1 +0,0 @@ -gov.nist.secauto.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 74% rename from src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java rename to src/test/java/dev/metaschema/oscal/lib/ExamplesTest.java index 8ae41cc4..887ca637 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/ExamplesTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/ExamplesTest.java @@ -3,26 +3,26 @@ * 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; -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 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.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 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 85% rename from src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java rename to src/test/java/dev/metaschema/oscal/lib/MetaschemaVisitorTest.java index a4b9bec6..c850af93 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/MetaschemaVisitorTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/MetaschemaVisitorTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.metapath.function.library.ResolveProfile; +package dev.metaschema.oscal.lib; + +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 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 92% rename from src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java rename to src/test/java/dev/metaschema/oscal/lib/OscalBindingContextTest.java index eef01c1d..df522174 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/OscalBindingContextTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/OscalBindingContextTest.java @@ -3,19 +3,19 @@ * 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; -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 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.core.util.ObjectUtils; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.ISerializer; +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 91% rename from src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java rename to src/test/java/dev/metaschema/oscal/lib/ReadWriteTest.java index fce6a2ea..4b08a4e9 100644 --- a/src/test/java/gov/nist/secauto/oscal/java/ReadWriteTest.java +++ b/src/test/java/dev/metaschema/oscal/lib/ReadWriteTest.java @@ -3,19 +3,19 @@ * 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; -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 gov.nist.secauto.oscal.lib.model.Catalog; +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 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 82% 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 21bf4b43..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,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.lib.model.util; +package dev.metaschema.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 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.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 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 81% 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 11be0862..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,18 +3,18 @@ * 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; -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 gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.NodeItemRecord; +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 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 93% 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 444f6c57..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; @@ -11,15 +11,15 @@ 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 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.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 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 84% 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 0b00d4c4..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; - -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 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; +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 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 57% 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 db9d9b03..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 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 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.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.databind.io.Format; +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 73% 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 53501ca7..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 gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.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.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.util.ObjectUtils; +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 96% 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 12c4e448..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 gov.nist.secauto.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.core.util.ObjectUtils; +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 72% 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 5ca6a5aa..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 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 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.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.databind.io.Format; +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 70% 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 8e8e938e..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,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -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 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; +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.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 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 86% 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 47d4473b..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 gov.nist.secauto.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.core.model.validation.IValidationResult; +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 82% 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 9e829032..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,34 +3,34 @@ * 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; -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 gov.nist.secauto.oscal.lib.OscalBindingContext; +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 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 e347850b..7a519115 100644 --- a/src/test/resources/log4j2-test.xml +++ b/src/test/resources/log4j2-test.xml @@ -10,21 +10,21 @@ - + - + - + - + - +