diff --git a/.claude/rules/metaschema-authoring.md b/.claude/rules/metaschema-authoring.md index 48237bfb4..c58d48371 100644 --- a/.claude/rules/metaschema-authoring.md +++ b/.claude/rules/metaschema-authoring.md @@ -126,7 +126,7 @@ When modifying Metapath functions or Metaschema features, update the correspondi | New exception type | Add to `.claude/skills/metaschema-java-library.md` exception hierarchy | | New key interface | Add to `.claude/skills/metaschema-java-library.md` | -**Function location:** `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/` +**Function location:** `core/src/main/java/dev/metaschema/core/metapath/function/library/` ## Related Skills diff --git a/.claude/skills/metapath-expressions.md b/.claude/skills/metapath-expressions.md index 69aea1e0a..c6e798efd 100644 --- a/.claude/skills/metapath-expressions.md +++ b/.claude/skills/metapath-expressions.md @@ -128,7 +128,7 @@ $config/@value **Note on function variants:** Many functions have multiple signatures with different argument counts. Optional parameters are shown with `?`. For the authoritative list of all function signatures, see the source code in: ```text -core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ +core/src/main/java/dev/metaschema/core/metapath/function/library/ ``` ### String Functions diff --git a/.claude/skills/metaschema-java-library.md b/.claude/skills/metaschema-java-library.md index 604171db8..9a0bd87ec 100644 --- a/.claude/skills/metaschema-java-library.md +++ b/.claude/skills/metaschema-java-library.md @@ -30,15 +30,15 @@ metaschema-framework (parent) | Package | Purpose | |---------|---------| -| `gov.nist.secauto.metaschema.core.model` | Model interfaces (`IModule`, `IAssemblyDefinition`, etc.) | -| `gov.nist.secauto.metaschema.core.metapath` | Metapath expression engine | -| `gov.nist.secauto.metaschema.core.metapath.function` | Function library | -| `gov.nist.secauto.metaschema.core.metapath.item` | Item types (nodes, atomics) | -| `gov.nist.secauto.metaschema.core.model.constraint` | Constraint validation | -| `gov.nist.secauto.metaschema.databind` | Data binding context | -| `gov.nist.secauto.metaschema.databind.io` | Serialization/deserialization | -| `gov.nist.secauto.metaschema.databind.model.annotations` | Binding annotations (`@BoundField`, `@BoundChoice`, etc.) | -| `gov.nist.secauto.metaschema.databind.codegen` | Code generation from Metaschema modules | +| `dev.metaschema.core.model` | Model interfaces (`IModule`, `IAssemblyDefinition`, etc.) | +| `dev.metaschema.core.metapath` | Metapath expression engine | +| `dev.metaschema.core.metapath.function` | Function library | +| `dev.metaschema.core.metapath.item` | Item types (nodes, atomics) | +| `dev.metaschema.core.model.constraint` | Constraint validation | +| `dev.metaschema.databind` | Data binding context | +| `dev.metaschema.databind.io` | Serialization/deserialization | +| `dev.metaschema.databind.model.annotations` | Binding annotations (`@BoundField`, `@BoundChoice`, etc.) | +| `dev.metaschema.databind.codegen` | Code generation from Metaschema modules | ## Annotation-Based Binding Model @@ -113,8 +113,8 @@ For annotation-based bindings, choices are optional by default (`minOccurs = 0`) ### Using IBindingContext ```java -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundModule; // Create binding context IBindingContext bindingContext = IBindingContext.newInstance(); @@ -131,7 +131,7 @@ IBindingContext context = IBindingContext.builder() ### Loading Module Files ```java -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; IBindingContext bindingContext = IBindingContext.newInstance(); IBindingModuleLoader loader = bindingContext.newModuleLoader(); @@ -145,10 +145,10 @@ IBindingMetaschemaModule module = loader.load(moduleUri); ### Compiling and Evaluating Expressions ```java -import gov.nist.secauto.metaschema.core.metapath.MetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.MetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.ISequence; // Compile expression with static context StaticContext staticContext = StaticContext.builder() @@ -270,7 +270,7 @@ Add dependencies to the `metaschema-maven-plugin` configuration to ensure classe ```xml - gov.nist.secauto.metaschema + dev.metaschema metaschema-maven-plugin @@ -298,8 +298,8 @@ Add dependencies to the `metaschema-maven-plugin` configuration to ensure classe ### Deserializing Content ```java -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.Format; IBindingContext bindingContext = IBindingContext.newInstance(); IBoundLoader loader = bindingContext.newBoundLoader(); @@ -316,7 +316,7 @@ MyRootClass object = deserializer.deserialize(inputStream); ### Serializing Content ```java -import gov.nist.secauto.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.io.ISerializer; ISerializer serializer = bindingContext.newSerializer( Format.JSON, MyRootClass.class); @@ -368,9 +368,9 @@ MyClass obj = deserializer.deserialize(inputStream); ### Basic Validation ```java -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidator; -import gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator; -import gov.nist.secauto.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler; +import dev.metaschema.core.model.constraint.IConstraintValidator; +import dev.metaschema.core.model.constraint.DefaultConstraintValidator; +import dev.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler; // Create handler to collect findings FindingCollectingConstraintValidationHandler handler = @@ -395,8 +395,8 @@ if (!result.isPassing()) { ### Loading External Constraints ```java -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.databind.model.metaschema.BindingConstraintLoader; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; BindingConstraintLoader constraintLoader = new BindingConstraintLoader(bindingContext); IConstraintSet constraintSet = constraintLoader.load(constraintUri); @@ -482,9 +482,9 @@ NegativeLengthArrayMetapathException ### Function Structure ```java -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.function.IArgument; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.MetapathConstants; public final class FnMyFunction { private static final String NAME = "my-function"; @@ -590,7 +590,7 @@ IItem (base) ### Working with Sequences ```java -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ISequence; // Create sequences ISequence seq = ISequence.of(item1, item2); diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1f22e3cd..39c9d5340 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,6 +83,11 @@ jobs: # ------------------------- # Maven Build # ------------------------- + - name: Build Maven Plugin First + run: | + # Build and install the maven-plugin and its dependencies first. + # This ensures the local plugin is used instead of a potentially stale remote SNAPSHOT. + mvn -B -e -pl metaschema-maven-plugin -am install -DskipTests - name: Build and Test Code run: | mvn -B -e -Prelease -Psnapshots -DaltDeploymentRepository=repo-snapshot::file://${GITHUB_WORKSPACE}/maven2/ -DaltSnapshotDeploymentRepository=repo-snapshot::file://${GITHUB_WORKSPACE}/maven2/ -DrepositoryId=repo-snapshot deploy @@ -229,6 +234,11 @@ jobs: # ------------------------- # Maven Build # ------------------------- + - name: Build Maven Plugin First + run: | + # Build and install the maven-plugin and its dependencies first. + # This ensures the local plugin is used instead of a potentially stale remote SNAPSHOT. + mvn -B -e -pl metaschema-maven-plugin -am install -DskipTests - name: Build and Test Website run: | mvn -B -e -PCI -Prelease install site site:stage -Dmaven.test.skip=true @@ -263,12 +273,15 @@ jobs: if [ -f "html-link-report.md" ]; then # Extract summary stats from the report ERRORS=$(grep -c "^\[ERR\]" html-link-report.md 2>/dev/null || echo "0") + TIMEOUTS=$(grep -c "^\[TIMEOUT\]" html-link-report.md 2>/dev/null || echo "0") if [ "$ERRORS" -gt 0 ]; then echo ":x: **Found $ERRORS broken link(s)**" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY grep "^\[ERR\]" html-link-report.md >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY + elif [ "$TIMEOUTS" -gt 0 ]; then + echo ":warning: **$TIMEOUTS link(s) timed out** (external sites may be slow)" >> $GITHUB_STEP_SUMMARY else echo ":white_check_mark: **All links valid**" >> $GITHUB_STEP_SUMMARY fi @@ -284,7 +297,8 @@ jobs: path: html-link-report.md retention-days: 5 - name: Create issue if bad links detected - if: ${{ !cancelled() && steps.linkchecker.outputs.exit_code != 0 && env.INPUT_ISSUE_ON_ERROR == 'true' }} + # Only create issues for actual broken links (exit code 2), not timeouts (exit code 1) + if: ${{ !cancelled() && steps.linkchecker.outputs.exit_code == 2 && env.INPUT_ISSUE_ON_ERROR == 'true' }} uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 with: title: Scheduled Check of Website Content Found Bad Hyperlinks @@ -293,7 +307,9 @@ jobs: bug documentation - name: Fail on link check error - if: ${{ !cancelled() && steps.linkchecker.outputs.exit_code != 0 && env.INPUT_FAIL_ON_ERROR == 'true' }} + # Exit codes: 0=success, 1=runtime errors/timeouts, 2=broken links found + # Only fail on actual broken links (exit code 2), not timeouts (exit code 1) + if: ${{ !cancelled() && steps.linkchecker.outputs.exit_code == 2 && env.INPUT_FAIL_ON_ERROR == 'true' }} uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd with: script: | diff --git a/CLAUDE.md b/CLAUDE.md index 885782e2c..8abe444d0 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -79,7 +79,7 @@ metaschema-framework (parent) └── metaschema-cli - Command-line interface ``` -### Core Module Structure (gov.nist.secauto.metaschema.core) +### Core Module Structure (dev.metaschema.core) - **model/** - Metaschema model interfaces (`IModule`, `IAssemblyDefinition`, `IFieldDefinition`, `IFlagDefinition`) - **metapath/** - Metapath query language implementation @@ -182,7 +182,7 @@ mvn -pl core test -Dtest=FnCountTest#testCount - Java 11 target - Uses SpotBugs annotations (`@NonNull`, `@Nullable`) for null safety -- Package structure follows `gov.nist.secauto.metaschema.*` convention +- Package structure follows `dev.metaschema.*` convention ### Javadoc Requirements (BLOCKING) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9da17ae41..0f0d41b0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,7 @@ This project enforces code style through static analysis tools. Contributors sho ### Core Metaschema functions -The Metaschema [specification](https://pages.nist.gov/metaschema/specification/syntax/metapath/) and [this conformant library](https://github.com/metaschema-framework/metaschema-java) library implement the Metapath functions required by the specification. See the library's [registry class with an inventory listing of the functions](https://github.com/metaschema-framework/metaschema-java/blob/main/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java) supported in the most current release. +The Metaschema [specification](https://pages.nist.gov/metaschema/specification/syntax/metapath/) and [this conformant library](https://github.com/metaschema-framework/metaschema-java) library implement the Metapath functions required by the specification. See the library's [registry class with an inventory listing of the functions](https://github.com/metaschema-framework/metaschema-java/blob/main/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java) supported in the most current release. # Licenses and attribution diff --git a/PRDs/20251206-build-cleanup/implementation-plan.md b/PRDs/20251206-build-cleanup/implementation-plan.md index fffb43f47..ff2946087 100644 --- a/PRDs/20251206-build-cleanup/implementation-plan.md +++ b/PRDs/20251206-build-cleanup/implementation-plan.md @@ -33,14 +33,14 @@ This ensures behavioral equivalence is verified, not assumed. #### Files Modified -1. `core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractContainerModelSupport.java` +1. `core/src/main/java/dev/metaschema/core/model/AbstractContainerModelSupport.java` - **Removed** empty `finalize()` method - abstract class with non-throwing constructor doesn't need finalizer attack protection -2. `databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java` +2. `databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java` - **Removed** empty `finalize()` method and unused `@SuppressFBWarnings` import - abstract class with non-throwing constructor doesn't need finalizer attack protection #### Files NOT Modified (intentionally kept) -1. `databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java` +1. `databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java` - **Kept** empty `finalize()` method - this is a non-final concrete class with a constructor that can throw, so the finalize() is required to prevent SEI CERT OBJ-11 finalizer attacks. Updated Javadoc to clarify this. #### Implementation Findings @@ -75,7 +75,7 @@ The original code used empty `finalize()` methods to prevent finalizer attacks ( #### Files Modified -1. `metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java` +1. `metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java` - Replaced deprecated `@Component` annotation with JSR-330 `@Inject` annotation for `BuildContext` injection - Updated import from `org.apache.maven.plugins.annotations.Component` to `javax.inject.Inject` @@ -283,7 +283,7 @@ Type requirement methods and remaining usages. | **Target Branch** | develop | #### Scope -`core/src/main/java/gov/nist/secauto/metaschema/core/model/` +`core/src/main/java/dev/metaschema/core/model/` #### Key Files - Interface definitions for metaschema model elements @@ -308,7 +308,7 @@ Type requirement methods and remaining usages. | **Target Branch** | develop | #### Scope -`core/src/main/java/gov/nist/secauto/metaschema/core/metapath/` +`core/src/main/java/dev/metaschema/core/metapath/` #### Key Files - Expression interfaces @@ -359,7 +359,7 @@ Type requirement methods and remaining usages. | **Target Branch** | develop | #### Scope -`databind/src/main/java/gov/nist/secauto/metaschema/databind/` +`databind/src/main/java/dev/metaschema/databind/` #### Key Files - `binding/AssemblyModel.java` (72 warnings - highest priority) @@ -384,7 +384,7 @@ Type requirement methods and remaining usages. | **Target Branch** | develop | #### Scope -`schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/` +`schemagen/src/main/java/dev/metaschema/schemagen/` #### Key Files - `ModuleIndex.java` (23 warnings - highest priority) diff --git a/PRDs/20251206-build-cleanup/warning-analysis.md b/PRDs/20251206-build-cleanup/warning-analysis.md index b0ffb3af6..522fac74c 100644 --- a/PRDs/20251206-build-cleanup/warning-analysis.md +++ b/PRDs/20251206-build-cleanup/warning-analysis.md @@ -28,9 +28,9 @@ This document provides a detailed analysis of warnings from the build output. | File | Line | Context | |------|------|---------| -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractContainerModelSupport.java` | 89 | Resource cleanup | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java` | 268 | Binding context cleanup | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java` | 223 | Generator cleanup | +| `core/src/main/java/dev/metaschema/core/model/AbstractContainerModelSupport.java` | 89 | Resource cleanup | +| `databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java` | 268 | Binding context cleanup | +| `databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java` | 223 | Generator cleanup | **Recommended Fix**: Replace with `java.lang.ref.Cleaner` API or remove if unnecessary. @@ -43,7 +43,7 @@ This document provides a detailed analysis of warnings from the build output. | File | Line | Field | |------|------|-------| -| `metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java` | 102 | Multiple `@Component` fields | +| `metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java` | 102 | Multiple `@Component` fields | **Recommended Fix**: Replace `@Component` with `@Inject` from JSR-330. diff --git a/PRDs/20251208-constraint-builder/PRD.md b/PRDs/20251208-constraint-builder/PRD.md index bcdb8152a..a4f9a52ef 100644 --- a/PRDs/20251208-constraint-builder/PRD.md +++ b/PRDs/20251208-constraint-builder/PRD.md @@ -53,7 +53,7 @@ Additional constraint types (for future extensibility): #### FR4: Integration with Test Support Infrastructure - Integrate with `IModuleMockFactory` interface - Follow the same patterns as `IModuleBuilder` -- Place in `gov.nist.secauto.metaschema.core.testsupport.builder` package +- Place in `dev.metaschema.core.testsupport.builder` package ### Test Migration Requirements @@ -113,7 +113,7 @@ IConstraintSet constraints = mocking.constraintSet() ### Package Structure ``` -gov.nist.secauto.metaschema.core.testsupport.builder/ +dev.metaschema.core.testsupport.builder/ ├── IConstraintSetBuilder.java # Main builder interface ├── ConstraintSetBuilder.java # Implementation ├── IContextBuilder.java # Context builder interface diff --git a/PRDs/20251208-constraint-builder/implementation-plan.md b/PRDs/20251208-constraint-builder/implementation-plan.md index 70208fda9..cd4751ef3 100644 --- a/PRDs/20251208-constraint-builder/implementation-plan.md +++ b/PRDs/20251208-constraint-builder/implementation-plan.md @@ -23,10 +23,10 @@ Two PRs to keep changes focused and reviewable: ### Commit 1: Create constraint builder interfaces **Files to create:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IConstraintSetBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IContextBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IAllowedValuesBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IMatchesBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/IAllowedValuesBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/IMatchesBuilder.java` **Acceptance Criteria:** - [ ] `IConstraintSetBuilder` defines fluent API for building constraint sets @@ -38,10 +38,10 @@ Two PRs to keep changes focused and reviewable: ### Commit 2: Implement constraint builders **Files to create:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ConstraintSetBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ContextBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AllowedValuesBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/MatchesBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/AllowedValuesBuilder.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/MatchesBuilder.java` **Acceptance Criteria:** - [ ] `ConstraintSetBuilder` creates `MetaConstraintSet` instances @@ -53,8 +53,8 @@ Two PRs to keep changes focused and reviewable: ### Commit 3: Integrate with IModuleMockFactory **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleMockFactory.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/MockedModelTestSupport.java` +- `core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java` +- `core/src/test/java/dev/metaschema/core/testsupport/MockedModelTestSupport.java` **Acceptance Criteria:** - [ ] `IModuleMockFactory.constraintSet()` method added @@ -64,7 +64,7 @@ Two PRs to keep changes focused and reviewable: ### Commit 4: Add unit tests for constraint builders **Files to create:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java` +- `core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java` **Acceptance Criteria:** - [ ] Test basic constraint set creation @@ -88,7 +88,7 @@ Two PRs to keep changes focused and reviewable: ### Commit 1: Migrate ExternalConstraintsModulePostProcessorTest **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java` +- `core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java` **Changes:** - Remove `XmlMetaConstraintLoader` usage @@ -132,7 +132,7 @@ This test uses both `XmlMetaConstraintLoader` AND `ModuleLoader` to load a modul **Recommended approach:** Option 1 - Keep this test XML-based as it tests the XML loading infrastructure. The goal is to reduce XMLBeans in tests, not eliminate all XML-based tests. **Files to modify (if migrating):** -- `core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaConstraintLoaderTest.java` +- `core/src/test/java/dev/metaschema/core/model/xml/MetaConstraintLoaderTest.java` **Acceptance Criteria:** - [ ] Decision documented on whether to migrate diff --git a/PRDs/20251208-module-builder/PRD.md b/PRDs/20251208-module-builder/PRD.md index 16a19336d..418a67b77 100644 --- a/PRDs/20251208-module-builder/PRD.md +++ b/PRDs/20251208-module-builder/PRD.md @@ -2,7 +2,7 @@ ## Overview -Add an `IModuleBuilder` to the existing test builder pattern in `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/`. This enables programmatic construction of `IModule` instances for testing, reducing dependency on XMLBeans-based `ModuleLoader`. +Add an `IModuleBuilder` to the existing test builder pattern in `core/src/test/java/dev/metaschema/core/testing/model/`. This enables programmatic construction of `IModule` instances for testing, reducing dependency on XMLBeans-based `ModuleLoader`. ## Goals diff --git a/PRDs/20251208-module-builder/implementation-plan.md b/PRDs/20251208-module-builder/implementation-plan.md index 6ebbca392..b644e290f 100644 --- a/PRDs/20251208-module-builder/implementation-plan.md +++ b/PRDs/20251208-module-builder/implementation-plan.md @@ -3,11 +3,11 @@ ## PR 1: Core Module Builder Infrastructure **Files to create:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IModuleBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/ModuleBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/IModuleBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/ModuleBuilder.java` **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IModuleMockFactory.java` - Add `module()` method +- `core/src/test/java/dev/metaschema/core/testing/model/IModuleMockFactory.java` - Add `module()` method **Acceptance Criteria:** - [ ] `IModuleBuilder` interface with metadata methods (namespace, shortName, version, source) @@ -22,14 +22,14 @@ ## PR 2: Definition Builder Integration **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/AbstractMetaschemaBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IFlagBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/FlagBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IFieldBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/FieldBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IAssemblyBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/AssemblyBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/ModuleBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/AbstractMetaschemaBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/IFlagBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/FlagBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/IFieldBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/FieldBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/IAssemblyBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/AssemblyBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/ModuleBuilder.java` **Acceptance Criteria:** - [ ] `AbstractMetaschemaBuilder.applyDefinition(IDefinition, IModule)` sets `getContainingModule()` @@ -48,13 +48,13 @@ ## PR 3: Reference Support for Recursive Assemblies **Files to create:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IModelReference.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/AssemblyReference.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/FieldReference.java` +- `core/src/test/java/dev/metaschema/core/testing/model/IModelReference.java` +- `core/src/test/java/dev/metaschema/core/testing/model/AssemblyReference.java` +- `core/src/test/java/dev/metaschema/core/testing/model/FieldReference.java` **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/IModuleBuilder.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/ModuleBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/IModuleBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/ModuleBuilder.java` **Acceptance Criteria:** - [ ] `IModelReference` marker interface for lazy references @@ -72,7 +72,7 @@ ## PR 4: Export and Root Assembly Support **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/testing/model/ModuleBuilder.java` +- `core/src/test/java/dev/metaschema/core/testing/model/ModuleBuilder.java` **Acceptance Criteria:** - [ ] `getExportedAssemblyDefinitions()` returns all assemblies (same as local) @@ -93,7 +93,7 @@ ## PR 5: Migrate ExternalConstraintsModulePostProcessorTest **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java` +- `core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java` **Acceptance Criteria:** - [ ] Test uses `IModuleBuilder` instead of `ModuleLoader` @@ -108,8 +108,8 @@ ## PR 6: Migrate Recursion Visitor Tests **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java` +- `core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java` +- `core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java` **Acceptance Criteria:** - [ ] Both tests use `IModuleBuilder` instead of `ModuleLoader` @@ -124,7 +124,7 @@ ## PR 7: Migrate MermaidErDiagramGeneratorTest **Files to modify:** -- `core/src/test/java/gov/nist/secauto/metaschema/core/util/MermaidErDiagramGeneratorTest.java` +- `core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java` **Acceptance Criteria:** - [ ] Test uses `IModuleBuilder` instead of `ModuleLoader` diff --git a/PRDs/20251215-path-formatters/plan.md b/PRDs/20251215-path-formatters/plan.md index 39bdb5c36..c3505b3d5 100644 --- a/PRDs/20251215-path-formatters/plan.md +++ b/PRDs/20251215-path-formatters/plan.md @@ -39,7 +39,7 @@ Validation results currently always use `MetapathFormatter` for paths. Users nee #### Path Format Selection Enum ```java -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; /** * Enumeration of path format selection options for validation output. @@ -319,29 +319,29 @@ IPathFormatter JSON_POINTER_PATH_FORMATTER = new JsonPointerFormatter(); ### Phase 1-3 Files (Completed) #### New Files -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatter.java` -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatter.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatterTest.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatterTest.java` +- `core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java` +- `core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java` +- `core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java` +- `core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java` #### Modified Files -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathFormatter.java` - Add constants -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/package-info.java` - Update docs +- `core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java` - Add constants +- `core/src/main/java/dev/metaschema/core/metapath/format/package-info.java` - Update docs #### Deleted Files -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPathFormatter.java` - Remove commented code +- `core/src/main/java/dev/metaschema/core/metapath/format/JsonPathFormatter.java` - Remove commented code ### Phase 4 Files (Planned) #### New Files -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/PathFormatSelection.java` - Enum for path format options -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/PathFormatterResolverTest.java` - Tests for resolver logic +- `core/src/main/java/dev/metaschema/core/metapath/format/PathFormatSelection.java` - Enum for path format options +- `core/src/test/java/dev/metaschema/core/metapath/format/PathFormatterResolverTest.java` - Tests for resolver logic #### Modified Files -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathFormatter.java` - Add `resolveFormatter()` method -- `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java` - Add convenience method -- `metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java` - Add `--path-format` option -- `metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/processor/LoggingValidationHandler.java` - Use configured formatter +- `core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java` - Add `resolveFormatter()` method +- `core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java` - Add convenience method +- `metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java` - Add `--path-format` option +- `metaschema-cli/src/main/java/dev/metaschema/cli/processor/LoggingValidationHandler.java` - Use configured formatter ## Code Examples diff --git a/PRDs/20251215-shell-completion/PRD.md b/PRDs/20251215-shell-completion/PRD.md index f714eee08..d90d94139 100644 --- a/PRDs/20251215-shell-completion/PRD.md +++ b/PRDs/20251215-shell-completion/PRD.md @@ -42,7 +42,7 @@ This approach provides: ### New Interfaces and Classes ```text -cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ +cli-processor/src/main/java/dev/metaschema/cli/processor/ ├── command/ │ └── ShellCompletionCommand.java └── completion/ @@ -609,7 +609,7 @@ compinit # Rebuild completion cache ### New Files ```text -cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ +cli-processor/src/main/java/dev/metaschema/cli/processor/ ├── command/ │ └── ShellCompletionCommand.java └── completion/ @@ -617,7 +617,7 @@ cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ ├── CompletionTypeRegistry.java └── CompletionScriptGenerator.java -cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/ +cli-processor/src/test/java/dev/metaschema/cli/processor/ └── completion/ ├── CompletionTypeRegistryTest.java └── CompletionScriptGeneratorTest.java @@ -628,7 +628,7 @@ cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/ **ExtraArgument extension (cli-processor):** ```text -cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ +cli-processor/src/main/java/dev/metaschema/cli/processor/command/ ├── ExtraArgument.java // Add getType() method and factory overload └── impl/ └── DefaultExtraArgument.java // Add type field and constructor @@ -639,7 +639,7 @@ cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ Commands that define options and extra arguments should add type information: ```text -metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ +metaschema-cli/src/main/java/dev/metaschema/cli/commands/ ├── MetaschemaCommands.java // Shared options ├── AbstractValidateContentCommand.java ├── GenerateSchemaCommand.java diff --git a/PRDs/20251215-shell-completion/implementation-plan.md b/PRDs/20251215-shell-completion/implementation-plan.md index 62f87f388..18ddfa7c6 100644 --- a/PRDs/20251215-shell-completion/implementation-plan.md +++ b/PRDs/20251215-shell-completion/implementation-plan.md @@ -4,7 +4,7 @@ ### Task 1.1: Create ICompletionType Interface -**File:** `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/ICompletionType.java` +**File:** `cli-processor/src/main/java/dev/metaschema/cli/processor/completion/ICompletionType.java` ```java /* @@ -12,7 +12,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; import edu.umd.cs.findbugs.annotations.NonNull; @@ -21,7 +21,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; *

* Instances are registered with {@link CompletionTypeRegistry} and looked up * by the type class specified in {@link org.apache.commons.cli.Option#getType()} - * or {@link gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument#getType()}. + * or {@link dev.metaschema.cli.processor.command.ExtraArgument#getType()}. */ public interface ICompletionType { /** @@ -48,7 +48,7 @@ public interface ICompletionType { ### Task 1.2: Create CompletionTypeRegistry -**File:** `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistry.java` +**File:** `cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java` ```java /* @@ -56,7 +56,7 @@ public interface ICompletionType { * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; import java.io.File; import java.net.URI; @@ -187,7 +187,7 @@ public final class CompletionTypeRegistry { ### Task 1.3: Extend ExtraArgument Interface -**File:** `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ExtraArgument.java` +**File:** `cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java` Add `getType()` method and new factory overload: @@ -223,7 +223,7 @@ static ExtraArgument newInstance(@NonNull String name, boolean required, @Nullab } ``` -**File:** `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/impl/DefaultExtraArgument.java` +**File:** `cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java` Add type field and update constructor: @@ -259,7 +259,7 @@ public class DefaultExtraArgument implements ExtraArgument { ### Task 1.4: Create CompletionScriptGenerator -**File:** `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGenerator.java` +**File:** `cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java` Key methods: @@ -347,7 +347,7 @@ Investigate existing patterns and choose the simplest approach. ### Task 2.2: Create ShellCompletionCommand -**File:** `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommand.java` +**File:** `cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java` ```java public class ShellCompletionCommand extends AbstractTerminalCommand { @@ -406,7 +406,7 @@ Execution flow: ### Task 3.1: Unit Tests for CompletionTypeRegistry -**File:** `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java` +**File:** `cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java` Test cases: - `testLookupFile()` - Returns `FileCompletionType` for `File.class` @@ -427,7 +427,7 @@ Test cases: ### Task 3.2: Unit Tests for Generator -**File:** `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java` +**File:** `cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java` Test cases: - `testBashSyntax()` - Generated script passes `bash -n` @@ -445,7 +445,7 @@ Test cases: ### Task 3.3: Integration Tests -**File:** `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommandTest.java` +**File:** `cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java` Test cases: - `testBashGeneration()` - Exit OK, non-empty output @@ -488,7 +488,7 @@ your-cli shell-completion zsh > ~/.zfunc/_your-cli Update existing option definitions in `metaschema-cli` to include `.type()` calls: -**File:** `metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java` +**File:** `metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java` ```java // Before diff --git a/PRDs/20251217-cli-processor-refactor/design.md b/PRDs/20251217-cli-processor-refactor/design.md index 773b68a57..bf8a72d77 100644 --- a/PRDs/20251217-cli-processor-refactor/design.md +++ b/PRDs/20251217-cli-processor-refactor/design.md @@ -31,12 +31,12 @@ The `processCommand` method in `CLIProcessor.java` has high cyclomatic and NPath ### File Structure ```text -cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ +cli-processor/src/main/java/dev/metaschema/cli/processor/ ├── CLIProcessor.java (simplified, delegates to CallingContext) ├── CallingContext.java (NEW - extracted, package-private) └── ... (existing files unchanged) -cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/ +cli-processor/src/test/java/dev/metaschema/cli/processor/ ├── CLIProcessorTest.java (NEW - integration tests) ├── CallingContextTest.java (NEW - unit tests for phases) └── ExitCodeTest.java (existing) @@ -259,10 +259,10 @@ This refactoring must be based on PR #551 (shell completion). That PR introduces ```java // Before (PR #551) -import gov.nist.secauto.metaschema.cli.processor.CLIProcessor.CallingContext; +import dev.metaschema.cli.processor.CLIProcessor.CallingContext; // After (our refactor) -import gov.nist.secauto.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.CallingContext; ``` 3. **`ExtraArgument.getType()`** - New method for completion hints. No impact on our design. diff --git a/PRDs/20251217-cli-processor-refactor/implementation-plan.md b/PRDs/20251217-cli-processor-refactor/implementation-plan.md index d6e500d67..108549db2 100644 --- a/PRDs/20251217-cli-processor-refactor/implementation-plan.md +++ b/PRDs/20251217-cli-processor-refactor/implementation-plan.md @@ -42,8 +42,8 @@ Expected: BUILD SUCCESS ### Task 1: Create Test Fixtures **Files:** -- Create: `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestVersionInfo.java` -- Create: `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommand.java` +- Create: `cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java` +- Create: `cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java` ### Step 1: Create TestVersionInfo @@ -53,9 +53,9 @@ Expected: BUILD SUCCESS * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; import edu.umd.cs.findbugs.annotations.NonNull; @@ -116,10 +116,10 @@ class TestVersionInfo implements IVersionInfo { * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; import org.apache.commons.cli.CommandLine; @@ -168,8 +168,8 @@ Expected: BUILD SUCCESS ### Step 4: Commit ```bash -git add cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestVersionInfo.java -git add cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommand.java +git add cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java +git add cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java git commit -m "test: add test fixtures for CLIProcessor testing" ``` @@ -178,7 +178,7 @@ git commit -m "test: add test fixtures for CLIProcessor testing" ### Task 2: Create Integration Tests for Existing Behavior **Files:** -- Create: `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessorTest.java` +- Create: `cli-processor/src/test/java/dev/metaschema/cli/processor/CLIProcessorTest.java` ### Step 1: Write integration test class with version test @@ -188,7 +188,7 @@ git commit -m "test: add test fixtures for CLIProcessor testing" * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @@ -316,7 +316,7 @@ Expected: BUILD SUCCESS (all tests pass - these characterize existing behavior) ### Step 3: Commit ```bash -git add cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessorTest.java +git add cli-processor/src/test/java/dev/metaschema/cli/processor/CLIProcessorTest.java git commit -m "test: add integration tests for CLIProcessor existing behavior" ``` @@ -327,7 +327,7 @@ git commit -m "test: add integration tests for CLIProcessor existing behavior" ### Task 3: Create CallingContext Top-Level Class (Copy) **Files:** -- Create: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Create: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Create new CallingContext.java file @@ -339,17 +339,17 @@ Copy the inner class to a new file, adding package-private visibility and updati * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.fusesource.jansi.Ansi.ansi; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -850,7 +850,7 @@ Expected: BUILD SUCCESS ### Step 3: Commit ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: extract CallingContext to top-level package-private class" ``` @@ -859,7 +859,7 @@ git commit -m "refactor: extract CallingContext to top-level package-private cla ### Task 4: Update CLIProcessor to Use Extracted CallingContext **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java` ### Step 1: Add package-private getter for outputStream @@ -951,7 +951,7 @@ Expected: BUILD SUCCESS (all tests pass) ### Step 7: Commit ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java git commit -m "refactor: update CLIProcessor to use extracted CallingContext" ``` @@ -960,18 +960,18 @@ git commit -m "refactor: update CLIProcessor to use extracted CallingContext" ### Task 5: Update ShellCompletionCommand Import **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommand.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java` ### Step 1: Update import statement Change: ```java -import gov.nist.secauto.metaschema.cli.processor.CLIProcessor.CallingContext; +import dev.metaschema.cli.processor.CLIProcessor.CallingContext; ``` To: ```java -import gov.nist.secauto.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.CallingContext; ``` ### Step 2: Run tests @@ -985,7 +985,7 @@ Expected: BUILD SUCCESS ### Step 3: Commit ShellCompletionCommand update ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommand.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java git commit -m "refactor: update ShellCompletionCommand import for extracted CallingContext" ``` @@ -996,7 +996,7 @@ git commit -m "refactor: update ShellCompletionCommand import for extracted Call ### Task 6: Add Unit Tests for Phase Methods **Files:** -- Create: `cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CallingContextTest.java` +- Create: `cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java` ### Step 1: Create CallingContextTest with phase tests @@ -1006,7 +1006,7 @@ git commit -m "refactor: update ShellCompletionCommand import for extracted Call * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -1187,7 +1187,7 @@ Expected: COMPILATION ERROR (methods not found) - this is expected for TDD ### Step 3: Commit test file ```bash -git add cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CallingContextTest.java +git add cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java git commit -m "test: add unit tests for CallingContext phase methods (TDD - red)" ``` @@ -1196,7 +1196,7 @@ git commit -m "test: add unit tests for CallingContext phase methods (TDD - red) ### Task 7: Extract checkHelpAndVersion Method **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Add checkHelpAndVersion method @@ -1252,7 +1252,7 @@ Expected: BUILD SUCCESS ### Step 4: Commit ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: extract checkHelpAndVersion phase method" ``` @@ -1261,7 +1261,7 @@ git commit -m "refactor: extract checkHelpAndVersion phase method" ### Task 8: Extract parseOptions Method **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Add parseOptions method @@ -1292,7 +1292,7 @@ Expected: BUILD SUCCESS ### Step 3: Commit parseOptions method ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: extract parseOptions phase method" ``` @@ -1301,7 +1301,7 @@ git commit -m "refactor: extract parseOptions phase method" ### Task 9: Extract validateExtraArguments Method **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Add validateExtraArguments method @@ -1343,7 +1343,7 @@ Expected: BUILD SUCCESS ### Step 3: Commit validateExtraArguments method ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: extract validateExtraArguments phase method" ``` @@ -1352,7 +1352,7 @@ git commit -m "refactor: extract validateExtraArguments phase method" ### Task 10: Extract validateCalledCommands Method **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Add validateCalledCommands method @@ -1391,7 +1391,7 @@ Expected: BUILD SUCCESS ### Step 3: Commit validateCalledCommands method ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: extract validateCalledCommands phase method" ``` @@ -1400,7 +1400,7 @@ git commit -m "refactor: extract validateCalledCommands phase method" ### Task 11: Extract applyGlobalOptions Method **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Add applyGlobalOptions method @@ -1433,7 +1433,7 @@ Expected: BUILD SUCCESS ### Step 3: Commit applyGlobalOptions method ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: extract applyGlobalOptions phase method" ``` @@ -1442,7 +1442,7 @@ git commit -m "refactor: extract applyGlobalOptions phase method" ### Task 12: Refactor processCommand to Use Phase Methods **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Replace processCommand implementation @@ -1516,7 +1516,7 @@ Expected: BUILD SUCCESS (no PMD violations) ### Step 5: Commit ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: simplify processCommand using extracted phase methods Reduces cyclomatic complexity by delegating to focused phase methods. @@ -1530,7 +1530,7 @@ Removes PMD suppressions for complexity warnings." ### Task 13: Verify GodClass Warning Resolved **Files:** -- Modify: `cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java` +- Modify: `cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java` ### Step 1: Remove GodClass suppression @@ -1559,7 +1559,7 @@ Expected: BUILD SUCCESS ### Step 4: Commit ```bash -git add cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +git add cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java git commit -m "refactor: remove PMD GodClass suppression from CallingContext" ``` diff --git a/PRDs/20251217-context-functions/PRD.md b/PRDs/20251217-context-functions/PRD.md index 76c807183..484adf65e 100644 --- a/PRDs/20251217-context-functions/PRD.md +++ b/PRDs/20251217-context-functions/PRD.md @@ -324,10 +324,10 @@ public final class FnDefaultLanguage { ### PR 1: Add FocusContext Infrastructure (Foundation) **Files to create:** -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/FocusContext.java` +- `core/src/main/java/dev/metaschema/core/metapath/FocusContext.java` **Files to modify:** -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java` +- `core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java` **Acceptance Criteria:** - [ ] FocusContext class created with position/size fields @@ -340,14 +340,14 @@ public final class FnDefaultLanguage { ### PR 2: Implement fn:position and fn:last **Files to create:** -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPosition.java` -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLast.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPositionTest.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLastTest.java` +- `core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java` +- `core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java` +- `core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java` +- `core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java` **Files to modify:** -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpression.java` +- `core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` +- `core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java` **Acceptance Criteria:** - [ ] FnPosition implementation complete @@ -361,12 +361,12 @@ public final class FnDefaultLanguage { ### PR 3: Add default-language Support **Files to create:** -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguage.java` -- `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java` +- `core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java` +- `core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java` **Files to modify:** -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java` -- `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` +- `core/src/main/java/dev/metaschema/core/metapath/StaticContext.java` +- `core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` **Acceptance Criteria:** - [ ] StaticContext extended with defaultLanguage field diff --git a/PRDs/20251217-context-functions/plan.md b/PRDs/20251217-context-functions/plan.md index eb3cc7c38..57d41960d 100644 --- a/PRDs/20251217-context-functions/plan.md +++ b/PRDs/20251217-context-functions/plan.md @@ -18,7 +18,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f ### Tasks #### 1.1 Create FocusContext Class -- [ ] Create `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/FocusContext.java` +- [ ] Create `core/src/main/java/dev/metaschema/core/metapath/FocusContext.java` - [ ] Add `sequence` field (ISequence) - [ ] Add `position` field (int, 1-based) - [ ] Add `size` field (int, lazy computed from sequence) @@ -30,7 +30,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Add comprehensive Javadoc #### 1.2 Extend DynamicContext -- [ ] Modify `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java` +- [ ] Modify `core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java` - [ ] Add `@Nullable FocusContext focusContext` as instance field (NOT in SharedState - focus is local to each scope) - [ ] Add `getFocusContext()` method returning `@Nullable FocusContext` - [ ] Add overloaded `subContext(@NonNull FocusContext)` method that creates a sub-context with new focus @@ -39,7 +39,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Add Javadoc for new methods #### 1.3 Write Unit Tests -- [ ] Create `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/FocusContextTest.java` +- [ ] Create `core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java` - [ ] Test factory method with item/position/size - [ ] Test factory method with sequence - [ ] Test position returns correct value @@ -61,7 +61,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f ### Tasks #### 2.1 Implement FnPosition -- [ ] Create `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPosition.java` +- [ ] Create `core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java` - [ ] Define SIGNATURE with: - name: "position" - namespace: MetapathConstants.NS_METAPATH_FUNCTIONS @@ -77,7 +77,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Add comprehensive Javadoc with spec reference #### 2.2 Implement FnLast -- [ ] Create `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLast.java` +- [ ] Create `core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java` - [ ] Define SIGNATURE with: - name: "last" - namespace: MetapathConstants.NS_METAPATH_FUNCTIONS @@ -93,20 +93,20 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Add comprehensive Javadoc with spec reference #### 2.3 Register Functions -- [ ] Modify `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` +- [ ] Modify `core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` - [ ] Add `registerFunction(FnPosition.SIGNATURE);` with spec comment - [ ] Add `registerFunction(FnLast.SIGNATURE);` with spec comment - [ ] Remove P1/P2 placeholder comments for these functions #### 2.4 Update PredicateExpression -- [ ] Modify `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpression.java` +- [ ] Modify `core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java` - [ ] Compute sequence size once at start of evaluation - [ ] For each item, create a sub-context with FocusContext set - [ ] Pass sub-context to predicate evaluation - [ ] Update imports as needed #### 2.5 Write FnPosition Tests -- [ ] Create `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPositionTest.java` +- [ ] Create `core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java` - [ ] Test position() returns 1 for first item - [ ] Test position() returns correct value for middle items - [ ] Test position() returns size for last item @@ -115,7 +115,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Test position() throws XPDY0002 when context absent #### 2.6 Write FnLast Tests -- [ ] Create `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLastTest.java` +- [ ] Create `core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java` - [ ] Test last() returns correct sequence size - [ ] Test last() in predicate `item[position() = last()]` - [ ] Test last() in predicate `item[last() - 1]` @@ -142,7 +142,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f ### Tasks #### 3.1 Extend StaticContext -- [ ] Modify `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java` +- [ ] Modify `core/src/main/java/dev/metaschema/core/metapath/StaticContext.java` - [ ] Add `@Nullable private final String defaultLanguage` field - [ ] Add `getDefaultLanguage()` method (returns "en" if null) - [ ] Update Builder: @@ -153,7 +153,7 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Add Javadoc for new methods #### 3.2 Implement FnDefaultLanguage -- [ ] Create `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguage.java` +- [ ] Create `core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java` - [ ] Define SIGNATURE with: - name: "default-language" - namespace: MetapathConstants.NS_METAPATH_FUNCTIONS @@ -168,11 +168,11 @@ This plan implements the remaining Metapath context functions: `fn:position`, `f - [ ] Add comprehensive Javadoc with spec reference #### 3.3 Register Function -- [ ] Modify `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` +- [ ] Modify `core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java` - [ ] Add `registerFunction(FnDefaultLanguage.SIGNATURE);` with spec comment #### 3.4 Write Tests -- [ ] Create `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java` +- [ ] Create `core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java` - [ ] Test default-language() returns "en" with default context - [ ] Test default-language() returns configured value - [ ] Test default-language() in expression comparison diff --git a/PRDs/20251217-parallel-constraint-validation/implementation-plan.md b/PRDs/20251217-parallel-constraint-validation/implementation-plan.md index d13670fb8..4f647f96a 100644 --- a/PRDs/20251217-parallel-constraint-validation/implementation-plan.md +++ b/PRDs/20251217-parallel-constraint-validation/implementation-plan.md @@ -13,8 +13,8 @@ ## Task 1: Create ParallelValidationConfig Class **Files:** -- Create: `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfig.java` -- Test: `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfigTest.java` +- Create: `core/src/main/java/dev/metaschema/core/model/constraint/ParallelValidationConfig.java` +- Test: `core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java` **Step 1: Write the failing tests** @@ -24,7 +24,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.*; @@ -116,7 +116,7 @@ Expected: Compilation error - class does not exist * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import java.util.Objects; import java.util.concurrent.ExecutorService; @@ -260,8 +260,8 @@ Expected: BUILD SUCCESS **Step 6: Commit** ```bash -git add core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfig.java -git add core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfigTest.java +git add core/src/main/java/dev/metaschema/core/model/constraint/ParallelValidationConfig.java +git add core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java git commit -m "feat(core): add ParallelValidationConfig for parallel constraint validation" ``` @@ -270,8 +270,8 @@ git commit -m "feat(core): add ParallelValidationConfig for parallel constraint ## Task 2: Make DynamicContext Thread-Safe **Files:** -- Modify: `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java` -- Test: `core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextTest.java` +- Modify: `core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java` +- Test: `core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java` **Step 1: Write failing tests for thread-safety** @@ -283,7 +283,7 @@ Add to existing test file or create new: * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.junit.jupiter.api.Assertions.*; @@ -341,7 +341,7 @@ Expected: FAIL - subContext shares executionStack with parent **Step 3: Modify DynamicContext** -In `core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java`: +In `core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java`: Change 1: Move executionStack from SharedState to instance field (around line 52): @@ -436,8 +436,8 @@ Expected: All tests PASS **Step 6: Commit** ```bash -git add core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java -git add core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextTest.java +git add core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java +git add core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java git commit -m "feat(core): make DynamicContext execution stack per-context for thread safety" ``` @@ -446,8 +446,8 @@ git commit -m "feat(core): make DynamicContext execution stack per-context for t ## Task 3: Make FindingCollectingConstraintValidationHandler Thread-Safe **Files:** -- Modify: `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java` -- Test: `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java` +- Modify: `core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java` +- Test: `core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java` **Step 1: Write failing tests for thread-safety and sorting** @@ -457,11 +457,11 @@ git commit -m "feat(core): make DynamicContext execution stack per-context for t * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.*; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint.Level; import org.junit.jupiter.api.Test; @@ -602,7 +602,7 @@ Expected: FAIL - race conditions or wrong ordering **Step 3: Modify FindingCollectingConstraintValidationHandler** -In `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java`: +In `core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java`: Change 1: Update imports (around line 20): @@ -681,8 +681,8 @@ Expected: All tests PASS **Step 6: Commit** ```bash -git add core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java -git add core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java +git add core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java +git add core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java git commit -m "feat(core): make FindingCollectingConstraintValidationHandler thread-safe" ``` @@ -691,8 +691,8 @@ git commit -m "feat(core): make FindingCollectingConstraintValidationHandler thr ## Task 4: Make DefaultConstraintValidator Thread-Safe **Files:** -- Modify: `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java` -- Test: `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java` +- Modify: `core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java` +- Test: `core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java` **Step 1: Write failing tests** @@ -702,7 +702,7 @@ git commit -m "feat(core): make FindingCollectingConstraintValidationHandler thr * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.*; @@ -792,7 +792,7 @@ Expected: FAIL or race condition errors **Step 3: Modify DefaultConstraintValidator** -In `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java`: +In `core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java`: Change 1: Update imports (add around line 37): @@ -847,8 +847,8 @@ Expected: All tests PASS **Step 6: Commit** ```bash -git add core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java -git add core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java +git add core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java +git add core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java git commit -m "feat(core): make DefaultConstraintValidator thread-safe" ``` @@ -857,8 +857,8 @@ git commit -m "feat(core): make DefaultConstraintValidator thread-safe" ## Task 5: Add Parallel Traversal to DefaultConstraintValidator **Files:** -- Modify: `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java` -- Test: `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationTest.java` +- Modify: `core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java` +- Test: `core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationTest.java` **Step 1: Write failing tests** @@ -868,11 +868,11 @@ git commit -m "feat(core): make DefaultConstraintValidator thread-safe" * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.*; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.DynamicContext; import org.junit.jupiter.api.Test; @@ -953,7 +953,7 @@ Expected: Compilation error - constructor does not exist **Step 3: Modify DefaultConstraintValidator for parallel support** -In `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java`: +In `core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java`: Change 1: Add imports: @@ -1100,8 +1100,8 @@ Expected: All tests PASS **Step 6: Commit** ```bash -git add core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java -git add core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationTest.java +git add core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java +git add core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationTest.java git commit -m "feat(core): add parallel traversal support to DefaultConstraintValidator" ``` @@ -1110,8 +1110,8 @@ git commit -m "feat(core): add parallel traversal support to DefaultConstraintVa ## Task 6: Add --threads CLI Option **Files:** -- Modify: `metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java` -- Test: `metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/ValidateCommandParallelTest.java` +- Modify: `metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java` +- Test: `metaschema-cli/src/test/java/dev/metaschema/cli/commands/ValidateCommandParallelTest.java` **Step 1: Write failing tests** @@ -1121,7 +1121,7 @@ git commit -m "feat(core): add parallel traversal support to DefaultConstraintVa * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; +package dev.metaschema.cli.commands; import static org.junit.jupiter.api.Assertions.*; @@ -1164,12 +1164,12 @@ Expected: Tests fail or option not recognized **Step 3: Modify AbstractValidateContentCommand** -In `metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java`: +In `metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java`: Change 1: Add import: ```java -import gov.nist.secauto.metaschema.core.model.constraint.ParallelValidationConfig; +import dev.metaschema.core.model.constraint.ParallelValidationConfig; ``` Change 2: Add constant for the option (around line 65): @@ -1276,8 +1276,8 @@ Expected: All tests PASS **Step 6: Commit** ```bash -git add metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java -git add metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/ValidateCommandParallelTest.java +git add metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java +git add metaschema-cli/src/test/java/dev/metaschema/cli/commands/ValidateCommandParallelTest.java git commit -m "feat(cli): add --threads option for parallel constraint validation" ``` @@ -1286,7 +1286,7 @@ git commit -m "feat(cli): add --threads option for parallel constraint validatio ## Task 7: Integration Testing and Documentation **Files:** -- Create: `metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/ParallelValidationIntegrationTest.java` +- Create: `metaschema-cli/src/test/java/dev/metaschema/cli/commands/ParallelValidationIntegrationTest.java` - Update: PRD with completion status **Step 1: Write integration tests** @@ -1297,7 +1297,7 @@ git commit -m "feat(cli): add --threads option for parallel constraint validatio * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; +package dev.metaschema.cli.commands; import static org.junit.jupiter.api.Assertions.*; @@ -1344,7 +1344,7 @@ Expected: BUILD SUCCESS **Step 4: Final commit** ```bash -git add metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/ParallelValidationIntegrationTest.java +git add metaschema-cli/src/test/java/dev/metaschema/cli/commands/ParallelValidationIntegrationTest.java git commit -m "test(cli): add integration tests for parallel constraint validation" ``` diff --git a/PRDs/20251221-xmlbeans-removal/implementation-plan.md b/PRDs/20251221-xmlbeans-removal/implementation-plan.md index e6a0fa269..f682b7cde 100644 --- a/PRDs/20251221-xmlbeans-removal/implementation-plan.md +++ b/PRDs/20251221-xmlbeans-removal/implementation-plan.md @@ -50,15 +50,15 @@ Use this schema for IDE validation when authoring the YAML Metaschema modules. | File | Description | |------|-------------| | `databind/src/main/metaschema/metaschema-bindings.yaml` | Metaschema module defining binding configuration schema (YAML format) | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/*.java` | Pre-generated binding classes (multiple files) | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/package-info.java` | Package documentation explaining bootstrap approach | +| `databind/src/main/java/dev/metaschema/databind/config/binding/*.java` | Pre-generated binding classes (multiple files) | +| `databind/src/main/java/dev/metaschema/databind/config/binding/package-info.java` | Package documentation explaining bootstrap approach | #### Files to Modify | File | Changes | |------|---------| | `databind/pom.xml` | Remove XMLBeans plugin and dependency; keep build-helper if needed | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java` | Replace XMLBeans imports/usage with Metaschema binding classes | +| `databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java` | Replace XMLBeans imports/usage with Metaschema binding classes | | `databind/src/main/java/module-info.java` | Update module exports/requires (remove xmlbeans) | | `databind/spotbugs-exclude.xml` | Update exclusions for new package instead of xmlbeans | @@ -68,7 +68,7 @@ Use this schema for IDE validation when authoring the YAML Metaschema modules. |------|--------| | `databind/src/main/xsd/metaschema-binding.xsd` | Replaced by Metaschema module | | `databind/src/schema/xmlconfig.xml` | XMLBeans configuration no longer needed | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/xmlbeans/package-info.java` | XMLBeans package no longer needed | +| `databind/src/main/java/dev/metaschema/databind/codegen/xmlbeans/package-info.java` | XMLBeans package no longer needed | | `databind/src/main/java/org/apache/xmlbeans/metadata/system/metaschema/codegen/package-info.java` | XMLBeans metadata package no longer needed | #### Implementation Approach @@ -138,7 +138,7 @@ Use this schema for IDE validation when authoring the YAML Metaschema modules. | File | Changes | |------|---------| | `metaschema-testing/pom.xml` | Remove XMLBeans plugin/dependency; add metaschema-maven-plugin | -| `metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java` | Replace XMLBeans usage with Metaschema binding classes | +| `metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java` | Replace XMLBeans usage with Metaschema binding classes | | `pom.xml` (parent) | Remove XMLBeans from dependency management | #### Files to Delete @@ -146,7 +146,7 @@ Use this schema for IDE validation when authoring the YAML Metaschema modules. | File | Reason | |------|--------| | `metaschema-testing/src/schema/xmlconfig.xml` | XMLBeans configuration no longer needed | -| `metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/xml/xmlbeans/` | Entire XMLBeans handler package | +| `metaschema-testing/src/main/java/dev/metaschema/model/testing/xml/xmlbeans/` | Entire XMLBeans handler package | **Note**: `core/metaschema/test-suite/unit-tests.xsd` is in the metaschema specification submodule (separate repository) and was not deleted. diff --git a/PRDs/20251224-codegen-quality/implementation-plan.md b/PRDs/20251224-codegen-quality/implementation-plan.md index e4bbe1dcb..45ed58ec6 100644 --- a/PRDs/20251224-codegen-quality/implementation-plan.md +++ b/PRDs/20251224-codegen-quality/implementation-plan.md @@ -40,16 +40,16 @@ This PR fixes the code generator and regenerates metaschema-testing binding clas | File | Changes | |------|---------| -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java` | Change `$S` to literal format to remove quotes from Javadoc | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java` | Add Javadoc to constructor generation | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java` | Add Javadoc to getter/setter generation | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelDefinitionTypeInfo.java` | Add null-safety annotations to generated code | +| `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java` | Change `$S` to literal format to remove quotes from Javadoc | +| `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java` | Add Javadoc to constructor generation | +| `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java` | Add Javadoc to getter/setter generation | +| `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelDefinitionTypeInfo.java` | Add null-safety annotations to generated code | ### Regenerated Files | File | Changes | |------|---------| -| `metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/*.java` | Regenerated binding classes with improved Javadoc | +| `metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/*.java` | Regenerated binding classes with improved Javadoc | ### Implementation Approach @@ -112,10 +112,10 @@ This PR extends the binding configuration to support overriding default collecti | File | Changes | |------|---------| -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java` | Add `getCollectionClass()` method to interface | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java` | Parse `` element | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java` | Update `getCollectionImplementationClass()` to accept override | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java` | Apply collection class override from binding config | +| `databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java` | Add `getCollectionClass()` method to interface | +| `databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java` | Parse `` element | +| `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java` | Update `getCollectionImplementationClass()` to accept override | +| `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java` | Apply collection class override from binding config | | `databind-modules/src/main/metaschema-bindings/metaschema-bindings.yaml` | Add `collection-class` field definition to binding schema | ### Implementation Approach diff --git a/PRDs/20251228-targeted-report-constraint/implementation-plan.md b/PRDs/20251228-targeted-report-constraint/implementation-plan.md index 998dad11b..c84221ec5 100644 --- a/PRDs/20251228-targeted-report-constraint/implementation-plan.md +++ b/PRDs/20251228-targeted-report-constraint/implementation-plan.md @@ -39,22 +39,22 @@ This document details the implementation for adding constraint processing suppor | File | Purpose | |------|---------| -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IReportConstraint.java` | Report constraint interface with `getTest()` method | -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultReportConstraint.java` | Default implementation with builder | -| `core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ReportConstraintTest.java` | Unit tests for report constraint | +| `core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java` | Report constraint interface with `getTest()` method | +| `core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java` | Default implementation with builder | +| `core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java` | Unit tests for report constraint | #### Files to Modify | File | Changes | |------|---------| -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintVisitor.java` | Add `visitReportConstraint()` method | -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java` | Add `getReportConstraints()` and `addConstraint(IReportConstraint)` methods | -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java` | Add delegation for report constraints | -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java` | Add storage and retrieval for report constraints | -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java` | Add `getReportConstraints()` forwarding in `applyTo()` | -| `core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java` | Add `validateReport()` method and integrate into validation flow | -| `databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java` | Add `TargetedReportConstraint` handling to `parse()` methods and `newReport()` factory | -| `databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java` | Add test for loading TargetedReportConstraint | +| `core/src/main/java/dev/metaschema/core/model/constraint/IConstraintVisitor.java` | Add `visitReportConstraint()` method | +| `core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java` | Add `getReportConstraints()` and `addConstraint(IReportConstraint)` methods | +| `core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java` | Add delegation for report constraints | +| `core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java` | Add storage and retrieval for report constraints | +| `core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java` | Add `getReportConstraints()` forwarding in `applyTo()` | +| `core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java` | Add `validateReport()` method and integrate into validation flow | +| `databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java` | Add `TargetedReportConstraint` handling to `parse()` methods and `newReport()` factory | +| `databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java` | Add test for loading TargetedReportConstraint | | `.claude/skills/metaschema-constraints-authoring.md` | Add `report` constraint type documentation | | `.claude/skills/metaschema-java-library.md` | Add `IReportConstraint` interface (if applicable) | diff --git a/PRDs/20251228-validation-errors/implementation-plan.md b/PRDs/20251228-validation-errors/implementation-plan.md index 19ec1fba9..661e93315 100644 --- a/PRDs/20251228-validation-errors/implementation-plan.md +++ b/PRDs/20251228-validation-errors/implementation-plan.md @@ -12,7 +12,7 @@ Single PR addressing all three related issues, organized into logical implementa ### Task 1.1: Create ValidationContext class -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ValidationContext.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java` Create a new class to bundle parsing context: @@ -36,7 +36,7 @@ public class ValidationContext { ### Task 1.2: Create PathTracker utility -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/PathTracker.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/PathTracker.java` Lightweight path tracking during parsing: @@ -58,7 +58,7 @@ public class PathTracker { ### Task 1.3: Create IResourceLocation implementation -**File**: `core/src/main/java/gov/nist/secauto/metaschema/core/model/SimpleResourceLocation.java` +**File**: `core/src/main/java/dev/metaschema/core/model/SimpleResourceLocation.java` Simple implementation of IResourceLocation: @@ -84,7 +84,7 @@ public class SimpleResourceLocation implements IResourceLocation { ### Task 2.1: Create test infrastructure -**File**: `databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ValidationErrorMessageTest.java` +**File**: `databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java` Create test class with helper methods for parsing test documents. @@ -156,7 +156,7 @@ Create test class with helper methods for parsing test documents. ### Task 3.1: Update IProblemHandler interface -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java` Add overloaded method with ValidationContext: @@ -179,7 +179,7 @@ default void handleMissingInstances( ### Task 3.2: Update AbstractProblemHandler -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java` Update validateRequiredFields to use ValidationContext: @@ -197,7 +197,7 @@ Update validateRequiredFields to use ValidationContext: ### Task 3.3: Update MetaschemaJsonReader -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java` Add path tracking and ValidationContext creation: @@ -212,7 +212,7 @@ Add path tracking and ValidationContext creation: ### Task 3.4: Update MetaschemaXmlReader -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java` Add path tracking and ValidationContext creation: @@ -227,7 +227,7 @@ Add path tracking and ValidationContext creation: ### Task 3.5: Update IXmlProblemHandler interface -**File**: `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java` +**File**: `databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java` Add overloaded methods with ValidationContext for XML-specific handling. @@ -239,8 +239,8 @@ Add overloaded methods with ValidationContext for XML-specific handling. ### Task 3.6: Handle null URI gracefully **Files**: -- `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java` -- `databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java` +- `databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java` +- `databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java` Use synthetic URI when null is passed to prevent NPE. diff --git a/PRDs/20251231-choice-required-fix/implementation-plan.md b/PRDs/20251231-choice-required-fix/implementation-plan.md index f96f19bd2..56c9e0b0f 100644 --- a/PRDs/20251231-choice-required-fix/implementation-plan.md +++ b/PRDs/20251231-choice-required-fix/implementation-plan.md @@ -18,7 +18,7 @@ Single PR containing: Create tests that verify `isRequired()` behavior before implementing the fix. -**File:** `databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java` +**File:** `databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java` **Test cases:** - [x] Property outside choice with minOccurs=1, maxOccurs=1 → returns `true` @@ -31,7 +31,7 @@ Create tests that verify `isRequired()` behavior before implementing the fix. Update `isRequired()` to check for choice membership. -**File:** `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java` +**File:** `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java` **Change:** ```java @@ -53,8 +53,8 @@ public boolean isRequired() { Document the choice block behavior and enhance setter Javadoc. **Files:** -- `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java` -- `databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java` +- `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java` +- `databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java` **Changes:** 1. Update `isRequired()` Javadoc to document choice block behavior diff --git a/PRDs/20251231-saxon-jdom2-removal/implementation-plan.md b/PRDs/20251231-saxon-jdom2-removal/implementation-plan.md index 8a11b9046..cac6eb863 100644 --- a/PRDs/20251231-saxon-jdom2-removal/implementation-plan.md +++ b/PRDs/20251231-saxon-jdom2-removal/implementation-plan.md @@ -46,8 +46,8 @@ Create a streaming XML indentation wrapper to replace Saxon XSLT post-processing | File | Change Type | |------|-------------| -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java` | Add | +| `schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java` | Add | #### TDD Sequence @@ -109,16 +109,16 @@ Replace JDOM2 XML parsing and XPath with javax.xml APIs. | File | Change Type | |------|-------------| -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java` | Add | -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoader.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContent.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java` | Delete | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java` | Delete | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java` | Modify | +| `schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java` | Add | +| `schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoader.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java` | Delete | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java` | Delete | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java` | Modify | #### TDD Sequence (Characterization Tests First) @@ -174,7 +174,7 @@ Replace Saxon XSLT transformation with IndentingXMLStreamWriter. | File | Change Type | |------|-------------| -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java` | Modify | | `schemagen/src/main/resources/identity.xsl` | Delete | #### TDD Sequence (Characterization Tests First) @@ -248,7 +248,7 @@ Update any tests that depend on JDOM2 or have whitespace-sensitive assertions. | File | Change Type | |------|-------------| -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java` | Modify | +| `schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java` | Modify | #### Acceptance Criteria @@ -278,26 +278,26 @@ Update any tests that depend on JDOM2 or have whitespace-sensitive assertions. | File | Change Type | |------|-------------| -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java` | Add | -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java` | Add | -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java` | Add | -| `schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java` | Modify | +| `schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java` | Add | +| `schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java` | Add | +| `schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java` | Add | +| `schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java` | Modify | ### Implementation Files | File | Change Type | |------|-------------| -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoader.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContent.java` | Add | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java` | Delete | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java` | Delete | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoader.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java` | Add | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java` | Delete | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java` | Delete | | `schemagen/src/main/resources/identity.xsl` | Delete | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java` | Modify | -| `schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java` | Modify | +| `schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java` | Modify | ### Configuration Files diff --git a/cli-processor/.settings/org.eclipse.jdt.apt.core.prefs b/cli-processor/.settings/org.eclipse.jdt.apt.core.prefs index 775dae91e..eb9e0b308 100644 --- a/cli-processor/.settings/org.eclipse.jdt.apt.core.prefs +++ b/cli-processor/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false -org.eclipse.jdt.apt.reconcileEnabled=false +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/cli-processor/.settings/org.eclipse.jdt.core.prefs b/cli-processor/.settings/org.eclipse.jdt.core.prefs index d5c6a182f..3d703be57 100644 --- a/cli-processor/.settings/org.eclipse.jdt.core.prefs +++ b/cli-processor/.settings/org.eclipse.jdt.core.prefs @@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false diff --git a/cli-processor/src/main/java-templates/gov/nist/secauto/metaschema/cli/processor/ProcessorVersion.java b/cli-processor/src/main/java-templates/dev/metaschema/cli/processor/ProcessorVersion.java similarity index 91% rename from cli-processor/src/main/java-templates/gov/nist/secauto/metaschema/cli/processor/ProcessorVersion.java rename to cli-processor/src/main/java-templates/dev/metaschema/cli/processor/ProcessorVersion.java index b9450bf16..b38a47c59 100644 --- a/cli-processor/src/main/java-templates/gov/nist/secauto/metaschema/cli/processor/ProcessorVersion.java +++ b/cli-processor/src/main/java-templates/dev/metaschema/cli/processor/ProcessorVersion.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; /** * Provides version information for this library. diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/AbstractExitStatus.java similarity index 98% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/AbstractExitStatus.java index a69ae9b51..a85bc5df3 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/AbstractExitStatus.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java similarity index 96% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java index a121d366e..ebf07b2fe 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.jline.jansi.Ansi.ansi; -import gov.nist.secauto.metaschema.cli.processor.command.CommandService; -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.command.CommandService; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.Option; import org.apache.logging.log4j.Level; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java similarity index 97% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java index 957fa8890..929f459e0 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CallingContext.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.jline.jansi.Ansi.ansi; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitCode.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/ExitCode.java similarity index 97% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitCode.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/ExitCode.java index 238b78395..3be40fc40 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitCode.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/ExitCode.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitStatus.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/ExitStatus.java similarity index 96% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitStatus.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/ExitStatus.java index 0975f405a..1b2a7553f 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/ExitStatus.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/ExitStatus.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/InvalidArgumentException.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/InvalidArgumentException.java similarity index 96% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/InvalidArgumentException.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/InvalidArgumentException.java index bc514b0c2..4e4e48433 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/InvalidArgumentException.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/InvalidArgumentException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import org.apache.commons.cli.Option; import org.apache.commons.cli.ParseException; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/MessageExitStatus.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java similarity index 90% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/MessageExitStatus.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java index ce2e4bf76..b65688403 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/MessageExitStatus.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Arrays; import java.util.List; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/NonMessageExitStatus.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/NonMessageExitStatus.java similarity index 94% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/NonMessageExitStatus.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/NonMessageExitStatus.java index 187ab68c0..257cb338d 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/NonMessageExitStatus.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/NonMessageExitStatus.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/OptionUtils.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/OptionUtils.java similarity index 92% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/OptionUtils.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/OptionUtils.java index b64822830..0b292a053 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/OptionUtils.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/OptionUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import org.apache.commons.cli.Option; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractCommandExecutor.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java similarity index 90% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractCommandExecutor.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java index 73171ecc8..e1d2df95a 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractCommandExecutor.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java similarity index 88% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java index 5d713b1ac..572222e56 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java similarity index 93% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java index 40e8d810f..139fd6de4 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractTerminalCommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.UriUtils; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/CommandExecutionException.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java similarity index 93% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/CommandExecutionException.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java index bf814eeec..129c63b02 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/CommandExecutionException.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/CommandService.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java similarity index 93% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/CommandService.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java index fc33b0b55..c4aff8609 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/CommandService.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.ServiceLoader; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ExtraArgument.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java similarity index 88% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ExtraArgument.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java index 622ea4335..f85d09c91 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ExtraArgument.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.command.impl.DefaultExtraArgument; +import dev.metaschema.cli.processor.command.impl.DefaultExtraArgument; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; @@ -80,8 +80,8 @@ default int getNumber() { * Get the type for shell completion purposes. *

* The type is used by - * {@link gov.nist.secauto.metaschema.cli.processor.completion.CompletionTypeRegistry} - * to lookup the appropriate completion behavior for this argument. + * {@link dev.metaschema.cli.processor.completion.CompletionTypeRegistry} to + * lookup the appropriate completion behavior for this argument. * * @return the type class used to determine shell completion behavior, or * {@code null} for freeform input diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ICommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java similarity index 95% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ICommand.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java index 63b37154d..6617adfee 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ICommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.InvalidArgumentException; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.InvalidArgumentException; +import dev.metaschema.core.util.CollectionUtil; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ICommandExecutor.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java similarity index 94% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ICommandExecutor.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java index 5de3de192..27e1123e5 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ICommandExecutor.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.CallingContext; import org.apache.commons.cli.CommandLine; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java similarity index 92% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommand.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java index f4d15bf0f..b89006373 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; -import gov.nist.secauto.metaschema.cli.processor.CLIProcessor; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.completion.CompletionScriptGenerator; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.CLIProcessor; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.completion.CompletionScriptGenerator; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/impl/DefaultExtraArgument.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java similarity index 92% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/impl/DefaultExtraArgument.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java index cee893b3e..b6988d7c6 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/impl/DefaultExtraArgument.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command.impl; +package dev.metaschema.cli.processor.command.impl; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ExtraArgument; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGenerator.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java similarity index 97% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGenerator.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java index 0dc26423a..e7a0424c9 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGenerator.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.Option; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistry.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java similarity index 97% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistry.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java index df5f5db91..dbaa52848 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistry.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.io.File; import java.net.URI; diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/ICompletionType.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/ICompletionType.java similarity index 83% rename from cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/ICompletionType.java rename to cli-processor/src/main/java/dev/metaschema/cli/processor/completion/ICompletionType.java index 22481659d..25b7300dd 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/completion/ICompletionType.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/ICompletionType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; import edu.umd.cs.findbugs.annotations.NonNull; @@ -12,8 +12,7 @@ *

* Instances are registered with {@link CompletionTypeRegistry} and looked up by * the type class specified in {@link org.apache.commons.cli.Option#getType()} - * or - * {@link gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument#getType()}. + * or {@link dev.metaschema.cli.processor.command.ExtraArgument#getType()}. */ public interface ICompletionType { /** diff --git a/cli-processor/src/main/java/module-info.java b/cli-processor/src/main/java/module-info.java index 935985dfe..8a2a7c744 100644 --- a/cli-processor/src/main/java/module-info.java +++ b/cli-processor/src/main/java/module-info.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommand; /** * Provides a command-line interface processing framework for Metaschema tools. * * @uses ICommand to discover CLI commands via service loader */ -module gov.nist.secauto.metaschema.cli.processor { +module dev.metaschema.cli.processor { // requirements requires java.base; - requires transitive gov.nist.secauto.metaschema.core; + requires transitive dev.metaschema.core; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; @@ -26,10 +26,10 @@ requires org.apache.logging.log4j.core; requires org.apache.logging.log4j.jul; - exports gov.nist.secauto.metaschema.cli.processor; - exports gov.nist.secauto.metaschema.cli.processor.command; - exports gov.nist.secauto.metaschema.cli.processor.command.impl; - exports gov.nist.secauto.metaschema.cli.processor.completion; + exports dev.metaschema.cli.processor; + exports dev.metaschema.cli.processor.command; + exports dev.metaschema.cli.processor.command.impl; + exports dev.metaschema.cli.processor.completion; uses ICommand; } diff --git a/cli-processor/src/main/resources/META-INF/services/dev.metaschema.cli.processor.command.ICommand b/cli-processor/src/main/resources/META-INF/services/dev.metaschema.cli.processor.command.ICommand new file mode 100644 index 000000000..b95d457fd --- /dev/null +++ b/cli-processor/src/main/resources/META-INF/services/dev.metaschema.cli.processor.command.ICommand @@ -0,0 +1 @@ +dev.metaschema.cli.processor.command.ShellCompletionCommand diff --git a/cli-processor/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.cli.processor.command.ICommand b/cli-processor/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.cli.processor.command.ICommand deleted file mode 100644 index 0f894679a..000000000 --- a/cli-processor/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.cli.processor.command.ICommand +++ /dev/null @@ -1 +0,0 @@ -gov.nist.secauto.metaschema.cli.processor.command.ShellCompletionCommand diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessorTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/CLIProcessorTest.java similarity index 99% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessorTest.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/CLIProcessorTest.java index 45070dbe5..28feebcda 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessorTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/CLIProcessorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CallingContextTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java similarity index 99% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CallingContextTest.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java index ac22d2b28..4699c6921 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/CallingContextTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.ParseException; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/ExitCodeTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/ExitCodeTest.java similarity index 98% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/ExitCodeTest.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/ExitCodeTest.java index 7f9d63da8..77d2cd44d 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/ExitCodeTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/ExitCodeTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommand.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java similarity index 79% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommand.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java index b61e1f5f3..7d56fca81 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommand.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; import org.apache.commons.cli.CommandLine; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommandWithRequiredArg.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java similarity index 78% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommandWithRequiredArg.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java index 69369d4b1..825838358 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommandWithRequiredArg.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; import org.apache.commons.cli.CommandLine; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommandWithRequiredOption.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java similarity index 85% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommandWithRequiredOption.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java index d59a912a0..3c67b3ce5 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestCommandWithRequiredOption.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestVersionInfo.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java similarity index 88% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestVersionInfo.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java index b3467945a..227ab4743 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/TestVersionInfo.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor; +package dev.metaschema.cli.processor; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommandTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java similarity index 93% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommandTest.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java index e84728056..064e7a5ab 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/command/ShellCompletionCommandTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.command; +package dev.metaschema.cli.processor.command; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.cli.processor.command.ShellCompletionCommand.Shell; +import dev.metaschema.cli.processor.command.ShellCompletionCommand.Shell; import org.junit.jupiter.api.Test; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java similarity index 96% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java index 5e8f7931c..9c6dce01d 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java similarity index 98% rename from cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java rename to cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java index 59c7291ca..28a4fb257 100644 --- a/cli-processor/src/test/java/gov/nist/secauto/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.processor.completion; +package dev.metaschema.cli.processor.completion; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/core/pom.xml b/core/pom.xml index bef574d80..66fb38b6f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -176,7 +176,7 @@ - gov/nist/secauto/metaschema/core/metapath/antlr/* + dev/metaschema/core/metapath/antlr/* @@ -190,10 +190,10 @@ -package - gov.nist.secauto.metaschema.core.metapath.antlr + dev.metaschema.core.metapath.antlr -o - ${project.build.directory}/generated-sources/antlr4/gov/nist/secauto/metaschema/core/metapath/antlr + ${project.build.directory}/generated-sources/antlr4/dev/metaschema/core/metapath/antlr true false diff --git a/core/spotbugs-exclude.xml b/core/spotbugs-exclude.xml index de7e7c28f..aa8364246 100644 --- a/core/spotbugs-exclude.xml +++ b/core/spotbugs-exclude.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd"> + name="dev.metaschema.core.metapath.antlr" /> diff --git a/core/src/main/java-templates/gov/nist/secauto/metaschema/core/MetaschemaJavaVersion.java b/core/src/main/java-templates/dev/metaschema/core/MetaschemaJavaVersion.java similarity index 92% rename from core/src/main/java-templates/gov/nist/secauto/metaschema/core/MetaschemaJavaVersion.java rename to core/src/main/java-templates/dev/metaschema/core/MetaschemaJavaVersion.java index 249d760ce..ea073b48f 100644 --- a/core/src/main/java-templates/gov/nist/secauto/metaschema/core/MetaschemaJavaVersion.java +++ b/core/src/main/java-templates/dev/metaschema/core/MetaschemaJavaVersion.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core; +package dev.metaschema.core; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; /** * Provides version information for this library. diff --git a/core/src/main/java-templates/gov/nist/secauto/metaschema/core/model/MetaschemaVersion.java b/core/src/main/java-templates/dev/metaschema/core/model/MetaschemaVersion.java similarity index 91% rename from core/src/main/java-templates/gov/nist/secauto/metaschema/core/model/MetaschemaVersion.java rename to core/src/main/java-templates/dev/metaschema/core/model/MetaschemaVersion.java index 942731fda..6215aea49 100644 --- a/core/src/main/java-templates/gov/nist/secauto/metaschema/core/model/MetaschemaVersion.java +++ b/core/src/main/java-templates/dev/metaschema/core/model/MetaschemaVersion.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; /** * Provides version information for the underlying Metaschema implementation used by this library. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/MetaschemaConstants.java b/core/src/main/java/dev/metaschema/core/MetaschemaConstants.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/MetaschemaConstants.java rename to core/src/main/java/dev/metaschema/core/MetaschemaConstants.java index 43ad55978..f24b42895 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/MetaschemaConstants.java +++ b/core/src/main/java/dev/metaschema/core/MetaschemaConstants.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core; +package dev.metaschema.core; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/AbstractConfigurationFeature.java b/core/src/main/java/dev/metaschema/core/configuration/AbstractConfigurationFeature.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/configuration/AbstractConfigurationFeature.java rename to core/src/main/java/dev/metaschema/core/configuration/AbstractConfigurationFeature.java index 1c56ce9f0..26dcf504f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/AbstractConfigurationFeature.java +++ b/core/src/main/java/dev/metaschema/core/configuration/AbstractConfigurationFeature.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.configuration; +package dev.metaschema.core.configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/DefaultConfiguration.java b/core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/configuration/DefaultConfiguration.java rename to core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java index 8877ab17a..a928dc7d4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/DefaultConfiguration.java +++ b/core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.configuration; +package dev.metaschema.core.configuration; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IConfiguration.java b/core/src/main/java/dev/metaschema/core/configuration/IConfiguration.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IConfiguration.java rename to core/src/main/java/dev/metaschema/core/configuration/IConfiguration.java index 0b86ec2c7..be4dbe311 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IConfiguration.java +++ b/core/src/main/java/dev/metaschema/core/configuration/IConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.configuration; +package dev.metaschema.core.configuration; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IConfigurationFeature.java b/core/src/main/java/dev/metaschema/core/configuration/IConfigurationFeature.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IConfigurationFeature.java rename to core/src/main/java/dev/metaschema/core/configuration/IConfigurationFeature.java index dab37e830..aea0e9de3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IConfigurationFeature.java +++ b/core/src/main/java/dev/metaschema/core/configuration/IConfigurationFeature.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.configuration; +package dev.metaschema.core.configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IMutableConfiguration.java b/core/src/main/java/dev/metaschema/core/configuration/IMutableConfiguration.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IMutableConfiguration.java rename to core/src/main/java/dev/metaschema/core/configuration/IMutableConfiguration.java index 27bb537e4..af781476b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/IMutableConfiguration.java +++ b/core/src/main/java/dev/metaschema/core/configuration/IMutableConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.configuration; +package dev.metaschema.core.configuration; import org.eclipse.jdt.annotation.Owning; diff --git a/core/src/main/java/dev/metaschema/core/configuration/package-info.java b/core/src/main/java/dev/metaschema/core/configuration/package-info.java new file mode 100644 index 000000000..7b87a6d0b --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/configuration/package-info.java @@ -0,0 +1,45 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides a type-safe configuration framework for processors and parsers. + *

+ * This package implements a feature-based configuration system inspired by + * Jackson's configuration model. Configuration options are defined as + * strongly-typed features that can be queried and modified through immutable or + * mutable configuration interfaces. + *

+ * Key interfaces and classes: + *

    + *
  • {@link dev.metaschema.core.configuration.IConfigurationFeature} - Defines + * a configuration option with a name, type, and default value
    • + *
  • {@link dev.metaschema.core.configuration.IConfiguration} - Immutable view + * of configuration state for querying feature values
    • + *
  • {@link dev.metaschema.core.configuration.IMutableConfiguration} - Mutable + * view allowing feature values to be modified
    • + *
  • {@link dev.metaschema.core.configuration.DefaultConfiguration} - Standard + * implementation of mutable configuration
    • + *
  • {@link dev.metaschema.core.configuration.AbstractConfigurationFeature} - + * Base class for implementing configuration features
    • + *
+ *

+ * Usage example: + * + * 

+ * // Define a feature
+ * IConfigurationFeature<Boolean> PRETTY_PRINT = ...;
+ *
+ * // Create and configure
+ * IMutableConfiguration<MyFeature> config = new DefaultConfiguration<>();
+ * config.enableFeature(PRETTY_PRINT);
+ *
+ * // Query configuration
+ * boolean enabled = config.isFeatureEnabled(PRETTY_PRINT);
+ *
+ * + * @see dev.metaschema.core.configuration.IConfigurationFeature + */ + +package dev.metaschema.core.configuration; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java rename to core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java index 753031f84..059cc4361 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java index 152e3f2cd..effc64c85 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java index a1c805e1a..8885bbb6c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.DataTypeItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.metapath.type.DataTypeItemType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java rename to core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java index 842671788..9f6e3bb98 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.type.DataTypeItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.type.DataTypeItemType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.util.CollectionUtil; import java.util.ArrayList; import java.util.LinkedList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java b/core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java rename to core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java index 3e0a18830..7c94ed6ee 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java +++ b/core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; - -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.datatype; + +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/ICustomJavaDataType.java b/core/src/main/java/dev/metaschema/core/datatype/ICustomJavaDataType.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/ICustomJavaDataType.java rename to core/src/main/java/dev/metaschema/core/datatype/ICustomJavaDataType.java index 05953b925..274b83db3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/ICustomJavaDataType.java +++ b/core/src/main/java/dev/metaschema/core/datatype/ICustomJavaDataType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java index 4a8c714f5..f73c10e28 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeProvider.java rename to core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java index cc8e276e8..3fe1cf8b1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java index 8b6604453..3a0436dec 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractDurationAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractDurationAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java index a4d8bff72..8e2ba8128 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractDurationAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java index 41176aa97..9396af4e8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import java.io.IOException; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractStringAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractStringAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java index 35a46f420..af8ba591d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractStringAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java index 0724903a9..ad16bca40 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java index 4625ec2a3..67de6f022 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.io.IOException; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java index 83c32bc99..80b2a751d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDate; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; +import dev.metaschema.core.datatype.object.AmbiguousDate; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalDate; import java.time.LocalTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateFormats.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateFormats.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateFormats.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DateFormats.java index cadfe47d5..a1d77cacd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateFormats.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateFormats.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java index ece84c111..24bc6351a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDateTime; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; +import dev.metaschema.core.datatype.object.AmbiguousDateTime; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalDateTime; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java index de1da99e7..410cefb69 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.DateTimeException; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java index 4f02122d4..b642744e8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.DateTimeException; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java index 7fbb67875..b61d7c328 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.Duration; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java index aeef13021..1ef6fca7c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.io.IOException; import java.math.BigDecimal; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java index aedd28b02..ce0e6e022 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IEmailAddressItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IEmailAddressItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HexBinaryAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HexBinaryAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java index 94021308b..179be329b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HexBinaryAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHexBinaryItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IHexBinaryItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java similarity index 70% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java index 68fd877cd..7c2b04d4d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHostnameItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IHostnameItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java index 12bc8b126..55465c9b6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv4AddressItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IIPv4AddressItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java index 7b16256e9..c7bf74e3a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv6AddressItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IIPv6AddressItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java similarity index 70% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java index 78b075792..471455f88 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigInteger; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java index 668c80401..f8430f519 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.type.impl.TypeConstants; +import dev.metaschema.core.datatype.AbstractDataTypeProvider; +import dev.metaschema.core.metapath.type.impl.TypeConstants; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java index 524db08de..604d08912 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INcNameItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.INcNameItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java index c8d0bfa2e..48abae9cc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigInteger; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java index a0ec219fe..76ab68331 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IPositiveIntegerItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IPositiveIntegerItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigInteger; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/QNameAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/QNameAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java index a81b54a1f..bdbaa1328 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/QNameAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IQNameItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IQNameItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java similarity index 70% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java index ab657ad70..58d9523d9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TimeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TimeAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java index fc4d78efe..2d186b628 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TimeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousTime; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; +import dev.metaschema.core.datatype.object.AmbiguousTime; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalTime; import java.time.OffsetTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TimeWithTZAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TimeWithTZAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java index 65063309b..c8660d4d6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TimeWithTZAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.DateTimeException; import java.time.OffsetTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java index fc83bae97..dc67046f0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITokenItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.ITokenItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java index 29232cd00..8c432136d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java index 5931557f9..ba1a8367e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUriReferenceItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IUriReferenceItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java index c45c98b9f..84926eeff 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IUuidItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.UUID; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java index 4007c9d86..485ff3e51 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.time.Period; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/package-info.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/package-info.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/package-info.java rename to core/src/main/java/dev/metaschema/core/datatype/adapter/package-info.java index 23d422109..92c3a9692 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/package-info.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/package-info.java @@ -7,9 +7,9 @@ * Built-in Metaschema data type adapters and implementations. *

* This package provides concrete implementations of - * {@link gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter} for all - * standard Metaschema data types, including primitives, temporal types, URIs, - * and binary data. + * {@link dev.metaschema.core.datatype.IDataTypeAdapter} for all standard + * Metaschema data types, including primitives, temporal types, URIs, and binary + * data. *

Abstract Base Classes

*

* The package includes specialized abstract adapters for common type families: @@ -42,8 +42,7 @@ *

Type Provider

*
    *
  • {@link MetaschemaDataTypeProvider} - Registers all built-in Metaschema - * types with the - * {@link gov.nist.secauto.metaschema.core.datatype.DataTypeService}
    • + * types with the {@link dev.metaschema.core.datatype.DataTypeService} *
*

Usage Context

*

@@ -56,7 +55,7 @@ *

  • Metapath atomic item creation for use in expressions
    • * * - * @see gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter + * @see dev.metaschema.core.datatype.IDataTypeAdapter */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java index 24e39905c..7f62b8c09 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IMarkupItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.evt.XMLEventFactory2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java index c529aae06..43c637738 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; @@ -14,16 +14,16 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.TextCollectingVisitor; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; -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.datatype.markup.flexmark.impl.AstCollectingVisitor; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.IMarkupVisitor; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.IMarkupWriter; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.MarkupVisitor; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlEventWriter; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlStreamWriter; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; +import dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupVisitor; +import dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupWriter; +import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupVisitor; +import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlEventWriter; +import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlStreamWriter; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java b/core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java index 8e9a06479..f96f845e4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.vladsch.flexmark.formatter.Formatter; import com.vladsch.flexmark.util.ast.Document; import com.vladsch.flexmark.util.ast.Node; -import gov.nist.secauto.metaschema.core.datatype.ICustomJavaDataType; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.datatype.ICustomJavaDataType; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.evt.XMLEventFactory2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupDataTypeProvider.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java index c4c0bb2ee..5a350e962 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.datatype.AbstractDataTypeProvider; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IMarkupItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.EQNameFactory; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java index ee8ebaa79..71dbb0753 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.vladsch.flexmark.html.HtmlRenderer; import com.vladsch.flexmark.parser.Parser; @@ -14,9 +14,9 @@ import com.vladsch.flexmark.util.data.MutableDataSet; import com.vladsch.flexmark.util.misc.Extension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.SuppressPTagExtension; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; +import dev.metaschema.core.datatype.markup.flexmark.impl.SuppressPTagExtension; import java.util.Collection; import java.util.LinkedList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java index e24134c86..ff143dc25 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupLineItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IMarkupLineItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLEventReader2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java index 08bf7afa8..137db2bec 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.vladsch.flexmark.util.ast.Document; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java index 0e7ddfdc9..f81224915 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLEventReader2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/XmlMarkupParser.java b/core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/XmlMarkupParser.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java index b11747b8e..ffb3c2547 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/XmlMarkupParser.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.vladsch.flexmark.util.sequence.Escaping; -import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java index 246e9ab5a..1b741cc7a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; +package dev.metaschema.core.datatype.markup.flexmark; import com.vladsch.flexmark.formatter.Formatter; import com.vladsch.flexmark.html.HtmlRenderer; @@ -12,8 +12,8 @@ import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.util.data.DataHolder; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.FixedEmphasisDelimiterProcessor; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; +import dev.metaschema.core.datatype.markup.flexmark.impl.FixedEmphasisDelimiterProcessor; +import dev.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java index 8c464fbee..625613af4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; +package dev.metaschema.core.datatype.markup.flexmark; import com.vladsch.flexmark.ext.typographic.TypographicQuotes; import com.vladsch.flexmark.html.HtmlRenderer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java index bf0afd03e..204741f20 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; // NOPMD AST processor +package dev.metaschema.core.datatype.markup.flexmark; // NOPMD AST processor import com.vladsch.flexmark.formatter.Formatter; import com.vladsch.flexmark.formatter.MarkdownWriter; @@ -36,7 +36,7 @@ import com.vladsch.flexmark.util.sequence.BasedSequence; import com.vladsch.flexmark.util.sequence.CharSubSequence; -import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString; +import dev.metaschema.core.datatype.markup.IMarkupString; import org.jsoup.nodes.Element; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java index d48465d12..1d735c977 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; // NOPMD AST processor has many members +package dev.metaschema.core.datatype.markup.flexmark.impl; // NOPMD AST processor has many members import com.vladsch.flexmark.ast.AutoLink; import com.vladsch.flexmark.ast.BlockQuote; @@ -42,10 +42,10 @@ import com.vladsch.flexmark.util.sequence.BasedSequence; import com.vladsch.flexmark.util.sequence.Escaping; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension.DoubleQuoteNode; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension.DoubleQuoteNode; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.text.StringEscapeUtils; import org.jsoup.Jsoup; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java index 451c2e8db..a5a3dfdf4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeVisitorBase; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/FixedEmphasisDelimiterProcessor.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FixedEmphasisDelimiterProcessor.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/FixedEmphasisDelimiterProcessor.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FixedEmphasisDelimiterProcessor.java index 0d4d8782f..374b8e752 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/FixedEmphasisDelimiterProcessor.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FixedEmphasisDelimiterProcessor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.ast.Emphasis; import com.vladsch.flexmark.ast.StrongEmphasis; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java index cbbd985e4..60ad0a62c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.ext.escaped.character.EscapedCharacterExtension; import com.vladsch.flexmark.ext.gfm.strikethrough.SubscriptExtension; @@ -21,9 +21,9 @@ import com.vladsch.flexmark.util.format.options.ListBulletMarker; import com.vladsch.flexmark.util.misc.Extension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java index f098e96df..6b50761a7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.ast.Code; import com.vladsch.flexmark.ast.Text; @@ -22,7 +22,7 @@ import com.vladsch.flexmark.util.sequence.Range; import com.vladsch.flexmark.util.sequence.SequenceUtils; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collections; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/IMarkupVisitor.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupVisitor.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/IMarkupVisitor.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupVisitor.java index 52f3d0b67..281b5e50c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/IMarkupVisitor.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.util.ast.Document; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java index 377927487..aa1c2ac7c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.ast.AutoLink; import com.vladsch.flexmark.ast.BlockQuote; @@ -31,8 +31,8 @@ import com.vladsch.flexmark.ext.typographic.TypographicSmarts; import com.vladsch.flexmark.util.ast.Node; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.util.CollectionUtil; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java index c16759cea..81b3b22cb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.ast.AutoLink; import com.vladsch.flexmark.ast.BlockQuote; @@ -41,8 +41,8 @@ import com.vladsch.flexmark.util.ast.Document; import com.vladsch.flexmark.util.ast.Node; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java index 94336e025..bf8039d40 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.parser.ListOptions; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.evt.XMLEventFactory2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlStreamWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlStreamWriter.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlStreamWriter.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlStreamWriter.java index 752c04caf..1bad387d8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlStreamWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlStreamWriter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.parser.ListOptions; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/SuppressPTagExtension.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/SuppressPTagExtension.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/SuppressPTagExtension.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/SuppressPTagExtension.java index f61792147..0245b2036 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/SuppressPTagExtension.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/SuppressPTagExtension.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; import com.vladsch.flexmark.ast.Paragraph; import com.vladsch.flexmark.html.HtmlRenderer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/package-info.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/package-info.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/package-info.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/package-info.java index f89494fa9..3cc10e223 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/package-info.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/package-info.java @@ -69,16 +69,16 @@ *

    * This package is internal implementation detail used by: *

      - *
    • Parent {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark} - * package for public markup processing APIs
      • - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup} for higher-level - * markup data type support
      • + *
    • Parent {@link dev.metaschema.core.datatype.markup.flexmark} package for + * public markup processing APIs
      • + *
    • {@link dev.metaschema.core.datatype.markup} for higher-level markup data + * type support
      • *
    • XML and JSON serialization components that need to render markup * content
      • *
    * - * @see gov.nist.secauto.metaschema.core.datatype.markup.flexmark - * @see gov.nist.secauto.metaschema.core.datatype.markup + * @see dev.metaschema.core.datatype.markup.flexmark + * @see dev.metaschema.core.datatype.markup */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; +package dev.metaschema.core.datatype.markup.flexmark.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/package-info.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/package-info.java similarity index 52% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/package-info.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/package-info.java index e5015456b..4ba21ca86 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/package-info.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/package-info.java @@ -15,7 +15,7 @@ *
      *
    • {@link FlexmarkFactory} - Factory for creating configured Flexmark parser * and renderer instances with Metaschema-specific extensions
      • - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration} + *
    • {@link dev.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration} * - Centralized configuration for Flexmark options and extensions
      • *
    *

    Custom Extensions

    @@ -27,33 +27,33 @@ } tag parsing and rendering *
  • {@link InsertAnchorExtension} - Enables insertion of anchor elements for * headings
    • - *
  • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.HtmlCodeRenderExtension} + *
  • {@link dev.metaschema.core.datatype.markup.flexmark.impl.HtmlCodeRenderExtension} * - Custom rendering for inline code elements
    • - *
  • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.SuppressPTagExtension} + *
  • {@link dev.metaschema.core.datatype.markup.flexmark.impl.SuppressPTagExtension} * - Suppresses paragraph tags in single-line markup
    • - *
  • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.FixedEmphasisDelimiterProcessor} + *
  • {@link dev.metaschema.core.datatype.markup.flexmark.impl.FixedEmphasisDelimiterProcessor} * - Fixes emphasis delimiter processing for Metaschema requirements
    • * *

    Visitors and Writers

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.IMarkupVisitor} + *
    • {@link dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupVisitor} * - Interface for visiting markup AST nodes
      • - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.MarkupVisitor} - * - Default visitor implementation for processing markup nodes
      • - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.IMarkupWriter} - * - Interface for writing markup to various output formats
      • - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlEventWriter} + *
    • {@link dev.metaschema.core.datatype.markup.flexmark.impl.MarkupVisitor} - + * Default visitor implementation for processing markup nodes
      • + *
    • {@link dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupWriter} - + * Interface for writing markup to various output formats
      • + *
    • {@link dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlEventWriter} * - Writes markup as XML events (StAX event-based API)
      • - *
    • {@link gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlStreamWriter} + *
    • {@link dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlStreamWriter} * - Writes markup as XML stream (StAX stream-based API)
      • *
    *

    Usage Context

    *

    * This package is primarily used internally by the - * {@link gov.nist.secauto.metaschema.core.datatype.markup} package to handle - * the low-level parsing and rendering of markup content. The Flexmark - * extensions ensure that Metaschema markup conforms to specification - * requirements while supporting a rich subset of Markdown and HTML features. + * {@link dev.metaschema.core.datatype.markup} package to handle the low-level + * parsing and rendering of markup content. The Flexmark extensions ensure that + * Metaschema markup conforms to specification requirements while supporting a + * rich subset of Markdown and HTML features. */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; +package dev.metaschema.core.datatype.markup.flexmark; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/package-info.java b/core/src/main/java/dev/metaschema/core/datatype/markup/package-info.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/package-info.java rename to core/src/main/java/dev/metaschema/core/datatype/markup/package-info.java index a00f2978f..9e455c09c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/package-info.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/package-info.java @@ -44,7 +44,7 @@ * The Flexmark library is used for Markdown parsing and rendering, with custom * extensions provided in the {@code flexmark} subpackage. * - * @see gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory + * @see dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java b/core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java rename to core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java index 62d032a59..6e793a955 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java +++ b/core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.object; +package dev.metaschema.core.datatype.object; -import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataType; +import dev.metaschema.core.datatype.AbstractCustomJavaDataType; import java.time.temporal.Temporal; @@ -62,7 +62,7 @@ public boolean hasTimeZone() { @Override public String toString() { - return getValue().toString() + (hasTimeZone() ? "" : "(abiguous)"); + return getValue().toString() + (hasTimeZone() ? "" : "(ambiguous)"); } } diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousDate.java b/core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousDate.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousDate.java rename to core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousDate.java index 256f87b37..8f8dcfcba 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousDate.java +++ b/core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousDate.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.object; +package dev.metaschema.core.datatype.object; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousDateTime.java b/core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousDateTime.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousDateTime.java rename to core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousDateTime.java index 0a6a78fef..b204b7a40 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousDateTime.java +++ b/core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousDateTime.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.object; +package dev.metaschema.core.datatype.object; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousTime.java b/core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousTime.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousTime.java rename to core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousTime.java index 7541b9bec..6c9dbb61a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/AmbiguousTime.java +++ b/core/src/main/java/dev/metaschema/core/datatype/object/AmbiguousTime.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.object; +package dev.metaschema.core.datatype.object; import java.time.OffsetTime; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/package-info.java b/core/src/main/java/dev/metaschema/core/datatype/object/package-info.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/package-info.java rename to core/src/main/java/dev/metaschema/core/datatype/object/package-info.java index c8450a5d2..fd6ad4b8a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/package-info.java +++ b/core/src/main/java/dev/metaschema/core/datatype/object/package-info.java @@ -26,8 +26,8 @@ *

    Usage Context

    *

    * These types are used by the temporal data type adapters in - * {@link gov.nist.secauto.metaschema.core.datatype.adapter} when parsing dates, - * times, and datetimes from Metaschema documents. The ambiguous temporal types: + * {@link dev.metaschema.core.datatype.adapter} when parsing dates, times, and + * datetimes from Metaschema documents. The ambiguous temporal types: *

      *
    • Preserve whether the original value included a timezone
      • *
    • Store the underlying temporal value as a {@link java.time.ZonedDateTime} @@ -41,4 +41,4 @@ * through parse-serialize cycles. */ -package gov.nist.secauto.metaschema.core.datatype.object; +package dev.metaschema.core.datatype.object; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/package-info.java b/core/src/main/java/dev/metaschema/core/datatype/package-info.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/package-info.java rename to core/src/main/java/dev/metaschema/core/datatype/package-info.java index 0babd3577..9dcf3e46a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/package-info.java +++ b/core/src/main/java/dev/metaschema/core/datatype/package-info.java @@ -44,9 +44,9 @@ * while specialized types for markup and temporal values are in their * respective subpackages. * - * @see gov.nist.secauto.metaschema.core.datatype.adapter - * @see gov.nist.secauto.metaschema.core.datatype.markup - * @see gov.nist.secauto.metaschema.core.datatype.object + * @see dev.metaschema.core.datatype.adapter + * @see dev.metaschema.core.datatype.markup + * @see dev.metaschema.core.datatype.object */ -package gov.nist.secauto.metaschema.core.datatype; +package dev.metaschema.core.datatype; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java index ee85de9d4..014318a33 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; -import gov.nist.secauto.metaschema.core.mdm.impl.DefinitionAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.mdm.impl.IDMModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.mdm.impl.DefinitionAssemblyNodeItem; +import dev.metaschema.core.mdm.impl.IDMModelNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; import edu.umd.cs.findbugs.annotations.NonNull; @@ -25,7 +25,7 @@ * from a document model. *

      * Child nodes can be created using the - * {@link #newFlag(gov.nist.secauto.metaschema.core.model.IFlagInstance, IAnyAtomicItem)}, + * {@link #newFlag(dev.metaschema.core.model.IFlagInstance, IAnyAtomicItem)}, * {@link #newAssembly(IAssemblyInstance)}, and * {@link #newField(IFieldInstance, IAnyAtomicItem)} methods. These children are * added to this assembly. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMDocumentNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMDocumentNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java index 3bd5fa672..0492fd09b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMDocumentNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; -import gov.nist.secauto.metaschema.core.mdm.impl.DocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.mdm.impl.DocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java similarity index 65% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMFieldNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java index 899741d80..6741ae5b7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; -import gov.nist.secauto.metaschema.core.mdm.impl.DefinitionFieldNodeItem; -import gov.nist.secauto.metaschema.core.mdm.impl.IDMModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.mdm.impl.DefinitionFieldNodeItem; +import dev.metaschema.core.mdm.impl.IDMModelNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMFlagNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java index 28d57d53d..b4ee9ff3d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; -import gov.nist.secauto.metaschema.core.mdm.impl.DefinitionFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.mdm.impl.DefinitionFlagNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.model.IFlagDefinition; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java index 269fd4d2d..d7e7e8a8c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IResourceLocation; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMRootAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMRootAssemblyNodeItem.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMRootAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/IDMRootAssemblyNodeItem.java index 13854b75a..ff25a0a18 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/IDMRootAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMRootAssemblyNodeItem.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; /** * Represents a Metapath root assembly node item implementation that is backed diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java index 7be95ecb6..33b4c0820 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.mdm.IDMFieldNodeItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java index 6468b84b0..192143d5f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.mdm.IDMFieldNodeItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java index 7b8adca2d..2d7acc8ac 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -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 dev.metaschema.core.mdm.IDMFlagNodeItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java index 3c34dfcec..24d35236b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMFlagNodeItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java index 8fd526db7..d5c2488ba 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/AbstractDMNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.AbstractNodeItem; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.mdm.IDMNodeItem; +import dev.metaschema.core.metapath.item.node.AbstractNodeItem; +import dev.metaschema.core.model.IResourceLocation; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java index a3725c7d3..9c96554aa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildFieldNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java index 1092c86a9..362deed8f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildFlagNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java index 96f4e88eb..04b1ad1bf 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/ChildFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java index 365bf92f0..f90c6eb42 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java index 94334e89e..177116038 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java index 04054b772..1b5c3aec2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DocumentNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DocumentNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java index 2fdfb4f1a..132e1d4fe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/DocumentNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; - -import gov.nist.secauto.metaschema.core.mdm.IDMDocumentNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.mdm.impl; + +import dev.metaschema.core.mdm.IDMDocumentNodeItem; +import dev.metaschema.core.mdm.IDMRootAssemblyNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/IDMModelNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java similarity index 65% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/IDMModelNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java index 02b6cecc6..9de402be1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/IDMModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMFlagNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.mdm.IDMFlagNodeItem; +import dev.metaschema.core.mdm.IDMNodeItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstance; import edu.umd.cs.findbugs.annotations.NonNull; @@ -23,7 +23,7 @@ * items. *

      * Child flags can be created using the - * {@link #newFlag(gov.nist.secauto.metaschema.core.model.IFlagInstance, IAnyAtomicItem)} + * {@link #newFlag(dev.metaschema.core.model.IFlagInstance, IAnyAtomicItem)} * method. These children are added to this assembly. * * @param diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/IFeatureChildNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/IFeatureChildNodeItem.java similarity index 65% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/IFeatureChildNodeItem.java rename to core/src/main/java/dev/metaschema/core/mdm/impl/IFeatureChildNodeItem.java index 61417aed7..a33dbe8c8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/IFeatureChildNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/IFeatureChildNodeItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.mdm.impl; +package dev.metaschema.core.mdm.impl; -import gov.nist.secauto.metaschema.core.mdm.IDMNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; +import dev.metaschema.core.mdm.IDMNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedInstance; /** * This feature identifies the implementing class as a node item that has a node diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/package-info.java b/core/src/main/java/dev/metaschema/core/mdm/impl/package-info.java new file mode 100644 index 000000000..8e8dadc09 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/package-info.java @@ -0,0 +1,57 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides implementation classes for the Metaschema Document Model (MDM) + * interfaces defined in {@link dev.metaschema.core.mdm}. + *

      + * This package contains the concrete implementations that support creating and + * managing in-memory document structures backed by Metaschema module + * definitions. These implementations handle the relationships between parent + * and child nodes, manage location information, and provide factory methods for + * creating new node instances. + *

      + * Key implementation classes include: + *

        + *
      • {@link dev.metaschema.core.mdm.impl.AbstractDMNodeItem} - Base abstract + * implementation for all MDM node items
        • + *
      • {@link dev.metaschema.core.mdm.impl.AbstractDMModelNodeItem} - Base for + * model node items (assemblies and fields) that support flags
        • + *
      • {@link dev.metaschema.core.mdm.impl.DocumentNodeItem} - Implementation of + * document root nodes
        • + *
      • {@link dev.metaschema.core.mdm.impl.DefinitionAssemblyNodeItem} - + * Assemblies created directly from definitions (orphaned from documents)
        • + *
      • {@link dev.metaschema.core.mdm.impl.ChildAssemblyNodeItem} - Assemblies + * created as children of other nodes
        • + *
      • {@link dev.metaschema.core.mdm.impl.DefinitionFieldNodeItem} - Fields + * created directly from definitions
        • + *
      • {@link dev.metaschema.core.mdm.impl.ChildFieldNodeItem} - Fields created + * as children of other nodes
        • + *
      • {@link dev.metaschema.core.mdm.impl.DefinitionFlagNodeItem} - Flags + * created directly from definitions
        • + *
      • {@link dev.metaschema.core.mdm.impl.ChildFlagNodeItem} - Flags created as + * children of other nodes
        • + *
      + *

      + * Supporting interfaces in this package include: + *

        + *
      • {@link dev.metaschema.core.mdm.impl.IDMModelNodeItem} - Interface for + * model nodes that support creating child flags
        • + *
      • {@link dev.metaschema.core.mdm.impl.IFeatureChildNodeItem} - Interface + * for nodes that have a parent-child relationship
        • + *
      + *

      + * The implementation distinguishes between two types of node creation: + *

        + *
      • Definition-based nodes - Created directly from + * Metaschema definitions, orphaned from any document or parent node. These are + * typically used as entry points for creating new document structures.
        • + *
      • Child nodes - Created as children of existing nodes + * through instance references. These maintain parent-child relationships and + * are part of a larger document structure.
        • + *
      + */ + +package dev.metaschema.core.mdm.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/package-info.java b/core/src/main/java/dev/metaschema/core/mdm/package-info.java similarity index 52% rename from core/src/main/java/gov/nist/secauto/metaschema/core/mdm/package-info.java rename to core/src/main/java/dev/metaschema/core/mdm/package-info.java index 9c8ce80e5..6b880ecae 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/package-info.java +++ b/core/src/main/java/dev/metaschema/core/mdm/package-info.java @@ -15,18 +15,18 @@ *

      * Key interfaces in this package include: *

        - *
      • {@link gov.nist.secauto.metaschema.core.mdm.IDMNodeItem} - Base interface - * for all MDM node items with location tracking support
        • - *
      • {@link gov.nist.secauto.metaschema.core.mdm.IDMDocumentNodeItem} - - * Represents a document root that contains the node tree
        • - *
      • {@link gov.nist.secauto.metaschema.core.mdm.IDMRootAssemblyNodeItem} - - * Represents the root assembly of a document
        • - *
      • {@link gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem} - - * Represents an assembly (complex object) with methods to add child nodes
        • - *
      • {@link gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem} - - * Represents a field (simple content with possible flags)
        • - *
      • {@link gov.nist.secauto.metaschema.core.mdm.IDMFlagNodeItem} - Represents - * a flag (attribute-like value)
        • + *
      • {@link dev.metaschema.core.mdm.IDMNodeItem} - Base interface for all MDM + * node items with location tracking support
        • + *
      • {@link dev.metaschema.core.mdm.IDMDocumentNodeItem} - Represents a + * document root that contains the node tree
        • + *
      • {@link dev.metaschema.core.mdm.IDMRootAssemblyNodeItem} - Represents the + * root assembly of a document
        • + *
      • {@link dev.metaschema.core.mdm.IDMAssemblyNodeItem} - Represents an + * assembly (complex object) with methods to add child nodes
        • + *
      • {@link dev.metaschema.core.mdm.IDMFieldNodeItem} - Represents a field + * (simple content with possible flags)
        • + *
      • {@link dev.metaschema.core.mdm.IDMFlagNodeItem} - Represents a flag + * (attribute-like value)
        • *
      *

      * The MDM can be used to: @@ -39,7 +39,7 @@ *

    *

    * Implementation classes for these interfaces are provided in the - * {@link gov.nist.secauto.metaschema.core.mdm.impl} package. + * {@link dev.metaschema.core.mdm.impl} package. */ -package gov.nist.secauto.metaschema.core.mdm; +package dev.metaschema.core.mdm; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ContextAbsentDynamicMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/ContextAbsentDynamicMetapathException.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ContextAbsentDynamicMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/ContextAbsentDynamicMetapathException.java index c5f80761d..75a8dda5a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ContextAbsentDynamicMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/ContextAbsentDynamicMetapathException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java b/core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java rename to core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java index 0140cc29b..a6b4bf300 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; - -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.metapath.function.CalledContext; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction.FunctionProperty; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.IUriResolver; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath; + +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.function.CalledContext; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.IFunction.FunctionProperty; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IUriResolver; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/DynamicMetapathException.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/DynamicMetapathException.java index 881055430..734ad22ad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/DynamicMetapathException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/FocusContext.java b/core/src/main/java/dev/metaschema/core/metapath/FocusContext.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/FocusContext.java rename to core/src/main/java/dev/metaschema/core/metapath/FocusContext.java index 33d120eb9..42fcda753 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/FocusContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/FocusContext.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IDocumentLoader.java b/core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IDocumentLoader.java rename to core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java index ee4bbf600..48eb04e23 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IDocumentLoader.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.IResourceResolver; -import gov.nist.secauto.metaschema.core.model.IUriResolver; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IResourceResolver; +import dev.metaschema.core.model.IUriResolver; +import dev.metaschema.core.util.ObjectUtils; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IErrorCode.java b/core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IErrorCode.java rename to core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java index 1d2ff8f4f..a4d65d195 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IErrorCode.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.impl.ErrorCodeImpl; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.impl.ErrorCodeImpl; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IExpression.java b/core/src/main/java/dev/metaschema/core/metapath/IExpression.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/IExpression.java index 2bf1f6f1a..d43f255d6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IExpression.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.List; @@ -21,7 +21,7 @@ * traversed and evaluated. * * @since 1.0.0 - * @see gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor + * @see dev.metaschema.core.metapath.cst.IExpressionVisitor */ public interface IExpression { /** diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IMetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IMetapathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java index b34aab546..1249133e6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IMetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -import gov.nist.secauto.metaschema.core.metapath.impl.LazyCompilationMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.impl.MetapathExpression; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.impl.LazyCompilationMetapathExpression; +import dev.metaschema.core.metapath.impl.MetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidMetapathGrammarException.java b/core/src/main/java/dev/metaschema/core/metapath/InvalidMetapathGrammarException.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidMetapathGrammarException.java rename to core/src/main/java/dev/metaschema/core/metapath/InvalidMetapathGrammarException.java index 029d18a9e..4fc4996d2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidMetapathGrammarException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/InvalidMetapathGrammarException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; /** * An exception to be raised when a Metapath is not a valid instance of the diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTreatTypeDynamicMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/InvalidTreatTypeDynamicMetapathException.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTreatTypeDynamicMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/InvalidTreatTypeDynamicMetapathException.java index 81bd2d0d6..cfc6921d0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTreatTypeDynamicMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/InvalidTreatTypeDynamicMetapathException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import java.util.Deque; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java b/core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java rename to core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java index c00757bca..b4c8ebd8c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java +++ b/core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathEvaluationFeature.java b/core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathEvaluationFeature.java rename to core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java index a4fc560b8..d13fb3354 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathEvaluationFeature.java +++ b/core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature; +import dev.metaschema.core.configuration.AbstractConfigurationFeature; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/MetapathException.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/MetapathException.java index 5b45adc0a..6c5576ffd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/MetapathException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import java.util.ArrayDeque; import java.util.Collections; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java b/core/src/main/java/dev/metaschema/core/metapath/StaticContext.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java rename to core/src/main/java/dev/metaschema/core/metapath/StaticContext.java index 0fa9021ac..fad7ccd7b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/StaticContext.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; - -import gov.nist.secauto.metaschema.core.datatype.DataTypeService; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionService; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.function.IFunctionResolver; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.qname.NamespaceCache; -import gov.nist.secauto.metaschema.core.qname.WellKnown; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath; + +import dev.metaschema.core.datatype.DataTypeService; +import dev.metaschema.core.metapath.function.FunctionService; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.IFunctionResolver; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.NamespaceCache; +import dev.metaschema.core.qname.WellKnown; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/StaticMetapathException.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/StaticMetapathException.java index 4c08bc7d9..cc6f98ceb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/StaticMetapathException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java index 74eec5120..b38467b7c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.antlr; // NOPMD requires a large number of public methods +package dev.metaschema.core.metapath.antlr; // NOPMD requires a large number of public methods -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RuleContext; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/FailingErrorListener.java b/core/src/main/java/dev/metaschema/core/metapath/antlr/FailingErrorListener.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/FailingErrorListener.java rename to core/src/main/java/dev/metaschema/core/metapath/antlr/FailingErrorListener.java index 4b9300644..930736b12 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/FailingErrorListener.java +++ b/core/src/main/java/dev/metaschema/core/metapath/antlr/FailingErrorListener.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.antlr; +package dev.metaschema.core.metapath.antlr; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.RecognitionException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/Metapath10ParserBase.java b/core/src/main/java/dev/metaschema/core/metapath/antlr/Metapath10ParserBase.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/Metapath10ParserBase.java rename to core/src/main/java/dev/metaschema/core/metapath/antlr/Metapath10ParserBase.java index bc056eaa7..d736601ed 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/Metapath10ParserBase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/antlr/Metapath10ParserBase.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.antlr; +package dev.metaschema.core.metapath.antlr; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.TokenStream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/ParseTreePrinter.java b/core/src/main/java/dev/metaschema/core/metapath/antlr/ParseTreePrinter.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/ParseTreePrinter.java rename to core/src/main/java/dev/metaschema/core/metapath/antlr/ParseTreePrinter.java index b9642ca49..7c5f5feb7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/ParseTreePrinter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/antlr/ParseTreePrinter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.antlr; +package dev.metaschema.core.metapath.antlr; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RuleContext; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/antlr/package-info.java similarity index 56% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/antlr/package-info.java index f0fe786d1..da45d2135 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/antlr/package-info.java @@ -15,18 +15,18 @@ *

    * Key classes: *

      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.antlr.AbstractAstVisitor} - * - Base visitor class for traversing and transforming ANTLR parse trees into + *
    • {@link dev.metaschema.core.metapath.antlr.AbstractAstVisitor} - Base + * visitor class for traversing and transforming ANTLR parse trees into * executable Metapath expression objects using the visitor pattern
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.antlr.FailingErrorListener} - * - ANTLR error listener that converts syntax errors into + *
    • {@link dev.metaschema.core.metapath.antlr.FailingErrorListener} - ANTLR + * error listener that converts syntax errors into * {@link org.antlr.v4.runtime.misc.ParseCancellationException} instances with * detailed position information
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.antlr.ParseTreePrinter} - * - Utility for generating textual representations of ANTLR parse trees for - * debugging purposes
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10ParserBase} - * - Base parser class providing custom parsing logic and helper methods
      • + *
    • {@link dev.metaschema.core.metapath.antlr.ParseTreePrinter} - Utility for + * generating textual representations of ANTLR parse trees for debugging + * purposes
      • + *
    • {@link dev.metaschema.core.metapath.antlr.Metapath10ParserBase} - Base + * parser class providing custom parsing logic and helper methods
      • *
    *

    * Generated ANTLR4 classes (created during build): @@ -40,10 +40,10 @@ *

    * This package is primarily used internally by the Metapath compiler and should * not be directly invoked by application code. Use - * {@link gov.nist.secauto.metaschema.core.metapath.IMetapathExpression} for - * compiling and evaluating Metapath expressions. + * {@link dev.metaschema.core.metapath.IMetapathExpression} for compiling and + * evaluating Metapath expressions. * - * @see gov.nist.secauto.metaschema.core.metapath.IMetapathExpression#compile(String) + * @see dev.metaschema.core.metapath.IMetapathExpression#compile(String) */ -package gov.nist.secauto.metaschema.core.metapath.antlr; +package dev.metaschema.core.metapath.antlr; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractBinaryExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractBinaryExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java index 8e5e16e8a..307537d18 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractBinaryExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IExpression; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java index cf94c0c1d..f494417e8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.antlr.AbstractAstVisitor; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.antlr.AbstractAstVisitor; +import dev.metaschema.core.metapath.antlr.Metapath10; +import dev.metaschema.core.util.ObjectUtils; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ParseTree; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java index 3b9e1216c..f2cdb324e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java index d4f163c98..bc0839169 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java @@ -3,55 +3,55 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; - -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySequenceConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySquareConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.DecimalLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.EmptySequence; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Except; -import gov.nist.secauto.metaschema.core.metapath.cst.items.IntegerLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Intersect; -import gov.nist.secauto.metaschema.core.metapath.cst.items.MapConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.PostfixLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Quantified; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Range; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SequenceExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SimpleMap; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringConcat; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.UnaryLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Union; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.And; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.GeneralComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.If; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.Or; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.PredicateExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.ValueComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Addition; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Division; -import gov.nist.secauto.metaschema.core.metapath.cst.math.IntegerDivision; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Modulo; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Negate; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem; -import gov.nist.secauto.metaschema.core.metapath.cst.path.FlagStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.KindNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstanceStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.NameNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.Step; -import gov.nist.secauto.metaschema.core.metapath.cst.path.WildcardNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Cast; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Castable; -import gov.nist.secauto.metaschema.core.metapath.cst.type.InstanceOf; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Treat; +package dev.metaschema.core.metapath.cst; + +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor; +import dev.metaschema.core.metapath.cst.items.ArraySquareConstructor; +import dev.metaschema.core.metapath.cst.items.DecimalLiteral; +import dev.metaschema.core.metapath.cst.items.EmptySequence; +import dev.metaschema.core.metapath.cst.items.Except; +import dev.metaschema.core.metapath.cst.items.IntegerLiteral; +import dev.metaschema.core.metapath.cst.items.Intersect; +import dev.metaschema.core.metapath.cst.items.MapConstructor; +import dev.metaschema.core.metapath.cst.items.PostfixLookup; +import dev.metaschema.core.metapath.cst.items.Quantified; +import dev.metaschema.core.metapath.cst.items.Range; +import dev.metaschema.core.metapath.cst.items.SequenceExpression; +import dev.metaschema.core.metapath.cst.items.SimpleMap; +import dev.metaschema.core.metapath.cst.items.StringConcat; +import dev.metaschema.core.metapath.cst.items.StringLiteral; +import dev.metaschema.core.metapath.cst.items.UnaryLookup; +import dev.metaschema.core.metapath.cst.items.Union; +import dev.metaschema.core.metapath.cst.logic.And; +import dev.metaschema.core.metapath.cst.logic.GeneralComparison; +import dev.metaschema.core.metapath.cst.logic.If; +import dev.metaschema.core.metapath.cst.logic.Or; +import dev.metaschema.core.metapath.cst.logic.PredicateExpression; +import dev.metaschema.core.metapath.cst.logic.ValueComparison; +import dev.metaschema.core.metapath.cst.math.Addition; +import dev.metaschema.core.metapath.cst.math.Division; +import dev.metaschema.core.metapath.cst.math.IntegerDivision; +import dev.metaschema.core.metapath.cst.math.Modulo; +import dev.metaschema.core.metapath.cst.math.Multiplication; +import dev.metaschema.core.metapath.cst.math.Negate; +import dev.metaschema.core.metapath.cst.math.Subtraction; +import dev.metaschema.core.metapath.cst.path.ContextItem; +import dev.metaschema.core.metapath.cst.path.FlagStep; +import dev.metaschema.core.metapath.cst.path.KindNodeTest; +import dev.metaschema.core.metapath.cst.path.ModelInstanceStep; +import dev.metaschema.core.metapath.cst.path.NameNodeTest; +import dev.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RelativeSlashPath; +import dev.metaschema.core.metapath.cst.path.RootDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RootSlashOnlyPath; +import dev.metaschema.core.metapath.cst.path.RootSlashPath; +import dev.metaschema.core.metapath.cst.path.Step; +import dev.metaschema.core.metapath.cst.path.WildcardNodeTest; +import dev.metaschema.core.metapath.cst.type.Cast; +import dev.metaschema.core.metapath.cst.type.Castable; +import dev.metaschema.core.metapath.cst.type.InstanceOf; +import dev.metaschema.core.metapath.cst.type.Treat; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; @@ -86,10 +86,10 @@ protected RESULT visit(@NonNull IExpression expression, @NonNull CONTEXT context * results. * * @param expr - * the expression whoose children should be visited + * the expression whose children should be visited * @param context * used to pass additional state - * @return the aggegated result + * @return the aggregated result */ protected RESULT visitChildren(@NonNull IExpression expr, @NonNull CONTEXT context) { RESULT result = defaultResult(); diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNAryExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNAryExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java index 131c533fd..8bad4e684 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNAryExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IExpression; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractUnaryExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractUnaryExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java index 612e0dfc3..13dffbe18 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractUnaryExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IExpression; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCall.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCall.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java index 99f9b02fe..81e18a153 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCall.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -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.impl.AbstractFunction; -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.type.ISequenceType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.impl.AbstractFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.util.ObjectUtils; import java.util.EnumSet; import java.util.Iterator; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java index 7ea611990..a0d659a37 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java @@ -3,77 +3,77 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; - -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidMetapathGrammarException; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10Lexer; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySequenceConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySquareConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.DecimalLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.EmptySequence; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Except; -import gov.nist.secauto.metaschema.core.metapath.cst.items.IntegerLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Intersect; -import gov.nist.secauto.metaschema.core.metapath.cst.items.MapConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.PostfixLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Quantified; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Range; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SequenceExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SimpleMap; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringConcat; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.UnaryLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Union; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.And; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.GeneralComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.IBooleanLogicExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.If; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.Or; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.PredicateExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.ValueComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Addition; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Division; -import gov.nist.secauto.metaschema.core.metapath.cst.math.IntegerDivision; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Modulo; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Negate; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction; -import gov.nist.secauto.metaschema.core.metapath.cst.path.Axis; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem; -import gov.nist.secauto.metaschema.core.metapath.cst.path.FlagStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.INodeTestExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.path.IWildcardMatcher; -import gov.nist.secauto.metaschema.core.metapath.cst.path.KindNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstanceStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.NameNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.Step; -import gov.nist.secauto.metaschema.core.metapath.cst.path.WildcardNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Cast; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Castable; -import gov.nist.secauto.metaschema.core.metapath.cst.type.InstanceOf; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Treat; -import gov.nist.secauto.metaschema.core.metapath.cst.type.TypeTestSupport; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -import gov.nist.secauto.metaschema.core.metapath.function.IArgument; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractKeySpecifier; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst; + +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.antlr.Metapath10; +import dev.metaschema.core.metapath.antlr.Metapath10Lexer; +import dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor; +import dev.metaschema.core.metapath.cst.items.ArraySquareConstructor; +import dev.metaschema.core.metapath.cst.items.DecimalLiteral; +import dev.metaschema.core.metapath.cst.items.EmptySequence; +import dev.metaschema.core.metapath.cst.items.Except; +import dev.metaschema.core.metapath.cst.items.IntegerLiteral; +import dev.metaschema.core.metapath.cst.items.Intersect; +import dev.metaschema.core.metapath.cst.items.MapConstructor; +import dev.metaschema.core.metapath.cst.items.PostfixLookup; +import dev.metaschema.core.metapath.cst.items.Quantified; +import dev.metaschema.core.metapath.cst.items.Range; +import dev.metaschema.core.metapath.cst.items.SequenceExpression; +import dev.metaschema.core.metapath.cst.items.SimpleMap; +import dev.metaschema.core.metapath.cst.items.StringConcat; +import dev.metaschema.core.metapath.cst.items.StringLiteral; +import dev.metaschema.core.metapath.cst.items.UnaryLookup; +import dev.metaschema.core.metapath.cst.items.Union; +import dev.metaschema.core.metapath.cst.logic.And; +import dev.metaschema.core.metapath.cst.logic.GeneralComparison; +import dev.metaschema.core.metapath.cst.logic.IBooleanLogicExpression; +import dev.metaschema.core.metapath.cst.logic.If; +import dev.metaschema.core.metapath.cst.logic.Or; +import dev.metaschema.core.metapath.cst.logic.PredicateExpression; +import dev.metaschema.core.metapath.cst.logic.ValueComparison; +import dev.metaschema.core.metapath.cst.math.Addition; +import dev.metaschema.core.metapath.cst.math.Division; +import dev.metaschema.core.metapath.cst.math.IntegerDivision; +import dev.metaschema.core.metapath.cst.math.Modulo; +import dev.metaschema.core.metapath.cst.math.Multiplication; +import dev.metaschema.core.metapath.cst.math.Negate; +import dev.metaschema.core.metapath.cst.math.Subtraction; +import dev.metaschema.core.metapath.cst.path.Axis; +import dev.metaschema.core.metapath.cst.path.ContextItem; +import dev.metaschema.core.metapath.cst.path.FlagStep; +import dev.metaschema.core.metapath.cst.path.INodeTestExpression; +import dev.metaschema.core.metapath.cst.path.IWildcardMatcher; +import dev.metaschema.core.metapath.cst.path.KindNodeTest; +import dev.metaschema.core.metapath.cst.path.ModelInstanceStep; +import dev.metaschema.core.metapath.cst.path.NameNodeTest; +import dev.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RelativeSlashPath; +import dev.metaschema.core.metapath.cst.path.RootDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RootSlashOnlyPath; +import dev.metaschema.core.metapath.cst.path.RootSlashPath; +import dev.metaschema.core.metapath.cst.path.Step; +import dev.metaschema.core.metapath.cst.path.WildcardNodeTest; +import dev.metaschema.core.metapath.cst.type.Cast; +import dev.metaschema.core.metapath.cst.type.Castable; +import dev.metaschema.core.metapath.cst.type.InstanceOf; +import dev.metaschema.core.metapath.cst.type.Treat; +import dev.metaschema.core.metapath.cst.type.TypeTestSupport; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IKeySpecifier; +import dev.metaschema.core.metapath.item.function.impl.AbstractKeySpecifier; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ParseTree; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java b/core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java index cae38ec27..0e6190edb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java @@ -3,55 +3,55 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; - -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySequenceConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySquareConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.DecimalLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.EmptySequence; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Except; -import gov.nist.secauto.metaschema.core.metapath.cst.items.IntegerLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Intersect; -import gov.nist.secauto.metaschema.core.metapath.cst.items.MapConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.PostfixLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Quantified; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Range; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SequenceExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SimpleMap; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringConcat; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.UnaryLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Union; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.And; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.GeneralComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.If; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.Or; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.PredicateExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.ValueComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Addition; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Division; -import gov.nist.secauto.metaschema.core.metapath.cst.math.IntegerDivision; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Modulo; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Negate; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem; -import gov.nist.secauto.metaschema.core.metapath.cst.path.FlagStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.KindNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstanceStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.NameNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.Step; -import gov.nist.secauto.metaschema.core.metapath.cst.path.WildcardNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Cast; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Castable; -import gov.nist.secauto.metaschema.core.metapath.cst.type.InstanceOf; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Treat; +package dev.metaschema.core.metapath.cst; + +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor; +import dev.metaschema.core.metapath.cst.items.ArraySquareConstructor; +import dev.metaschema.core.metapath.cst.items.DecimalLiteral; +import dev.metaschema.core.metapath.cst.items.EmptySequence; +import dev.metaschema.core.metapath.cst.items.Except; +import dev.metaschema.core.metapath.cst.items.IntegerLiteral; +import dev.metaschema.core.metapath.cst.items.Intersect; +import dev.metaschema.core.metapath.cst.items.MapConstructor; +import dev.metaschema.core.metapath.cst.items.PostfixLookup; +import dev.metaschema.core.metapath.cst.items.Quantified; +import dev.metaschema.core.metapath.cst.items.Range; +import dev.metaschema.core.metapath.cst.items.SequenceExpression; +import dev.metaschema.core.metapath.cst.items.SimpleMap; +import dev.metaschema.core.metapath.cst.items.StringConcat; +import dev.metaschema.core.metapath.cst.items.StringLiteral; +import dev.metaschema.core.metapath.cst.items.UnaryLookup; +import dev.metaschema.core.metapath.cst.items.Union; +import dev.metaschema.core.metapath.cst.logic.And; +import dev.metaschema.core.metapath.cst.logic.GeneralComparison; +import dev.metaschema.core.metapath.cst.logic.If; +import dev.metaschema.core.metapath.cst.logic.Or; +import dev.metaschema.core.metapath.cst.logic.PredicateExpression; +import dev.metaschema.core.metapath.cst.logic.ValueComparison; +import dev.metaschema.core.metapath.cst.math.Addition; +import dev.metaschema.core.metapath.cst.math.Division; +import dev.metaschema.core.metapath.cst.math.IntegerDivision; +import dev.metaschema.core.metapath.cst.math.Modulo; +import dev.metaschema.core.metapath.cst.math.Multiplication; +import dev.metaschema.core.metapath.cst.math.Negate; +import dev.metaschema.core.metapath.cst.math.Subtraction; +import dev.metaschema.core.metapath.cst.path.ContextItem; +import dev.metaschema.core.metapath.cst.path.FlagStep; +import dev.metaschema.core.metapath.cst.path.KindNodeTest; +import dev.metaschema.core.metapath.cst.path.ModelInstanceStep; +import dev.metaschema.core.metapath.cst.path.NameNodeTest; +import dev.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RelativeSlashPath; +import dev.metaschema.core.metapath.cst.path.RootDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RootSlashOnlyPath; +import dev.metaschema.core.metapath.cst.path.RootSlashPath; +import dev.metaschema.core.metapath.cst.path.Step; +import dev.metaschema.core.metapath.cst.path.WildcardNodeTest; +import dev.metaschema.core.metapath.cst.type.Cast; +import dev.metaschema.core.metapath.cst.type.Castable; +import dev.metaschema.core.metapath.cst.type.InstanceOf; +import dev.metaschema.core.metapath.cst.type.Treat; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DynamicFunctionCall.java b/core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DynamicFunctionCall.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java index 555576b22..1b6f87c82 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DynamicFunctionCall.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java b/core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java index 9d228d939..737139f34 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java b/core/src/main/java/dev/metaschema/core/metapath/cst/For.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/For.java index 906dbaeed..4ca0506e1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/For.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.Let.VariableDeclaration; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.Let.VariableDeclaration; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCallAccessor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCallAccessor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java index b89bcccbf..cbaa17cb4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCallAccessor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ICstExpressionFactory.java b/core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ICstExpressionFactory.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java index 8813ba7c3..45c1dfe88 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ICstExpressionFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.Let.VariableDeclaration; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySequenceConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySquareConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.DecimalLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.EmptySequence; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Except; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.And; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.If; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Addition; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.Let.VariableDeclaration; +import dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor; +import dev.metaschema.core.metapath.cst.items.ArraySquareConstructor; +import dev.metaschema.core.metapath.cst.items.DecimalLiteral; +import dev.metaschema.core.metapath.cst.items.EmptySequence; +import dev.metaschema.core.metapath.cst.items.Except; +import dev.metaschema.core.metapath.cst.logic.And; +import dev.metaschema.core.metapath.cst.logic.If; +import dev.metaschema.core.metapath.cst.math.Addition; +import dev.metaschema.core.metapath.item.IItem; import java.math.BigDecimal; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java index 53383c9da..0360e9932 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java @@ -3,54 +3,54 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; - -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySequenceConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySquareConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.DecimalLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.EmptySequence; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Except; -import gov.nist.secauto.metaschema.core.metapath.cst.items.IntegerLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Intersect; -import gov.nist.secauto.metaschema.core.metapath.cst.items.MapConstructor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.PostfixLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Quantified; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Range; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SequenceExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SimpleMap; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringConcat; -import gov.nist.secauto.metaschema.core.metapath.cst.items.StringLiteral; -import gov.nist.secauto.metaschema.core.metapath.cst.items.UnaryLookup; -import gov.nist.secauto.metaschema.core.metapath.cst.items.Union; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.And; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.GeneralComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.If; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.Or; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.PredicateExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.ValueComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Addition; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Division; -import gov.nist.secauto.metaschema.core.metapath.cst.math.IntegerDivision; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Modulo; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Negate; -import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem; -import gov.nist.secauto.metaschema.core.metapath.cst.path.FlagStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.KindNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstanceStep; -import gov.nist.secauto.metaschema.core.metapath.cst.path.NameNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath; -import gov.nist.secauto.metaschema.core.metapath.cst.path.Step; -import gov.nist.secauto.metaschema.core.metapath.cst.path.WildcardNodeTest; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Cast; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Castable; -import gov.nist.secauto.metaschema.core.metapath.cst.type.InstanceOf; -import gov.nist.secauto.metaschema.core.metapath.cst.type.Treat; +package dev.metaschema.core.metapath.cst; + +import dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor; +import dev.metaschema.core.metapath.cst.items.ArraySquareConstructor; +import dev.metaschema.core.metapath.cst.items.DecimalLiteral; +import dev.metaschema.core.metapath.cst.items.EmptySequence; +import dev.metaschema.core.metapath.cst.items.Except; +import dev.metaschema.core.metapath.cst.items.IntegerLiteral; +import dev.metaschema.core.metapath.cst.items.Intersect; +import dev.metaschema.core.metapath.cst.items.MapConstructor; +import dev.metaschema.core.metapath.cst.items.PostfixLookup; +import dev.metaschema.core.metapath.cst.items.Quantified; +import dev.metaschema.core.metapath.cst.items.Range; +import dev.metaschema.core.metapath.cst.items.SequenceExpression; +import dev.metaschema.core.metapath.cst.items.SimpleMap; +import dev.metaschema.core.metapath.cst.items.StringConcat; +import dev.metaschema.core.metapath.cst.items.StringLiteral; +import dev.metaschema.core.metapath.cst.items.UnaryLookup; +import dev.metaschema.core.metapath.cst.items.Union; +import dev.metaschema.core.metapath.cst.logic.And; +import dev.metaschema.core.metapath.cst.logic.GeneralComparison; +import dev.metaschema.core.metapath.cst.logic.If; +import dev.metaschema.core.metapath.cst.logic.Or; +import dev.metaschema.core.metapath.cst.logic.PredicateExpression; +import dev.metaschema.core.metapath.cst.logic.ValueComparison; +import dev.metaschema.core.metapath.cst.math.Addition; +import dev.metaschema.core.metapath.cst.math.Division; +import dev.metaschema.core.metapath.cst.math.IntegerDivision; +import dev.metaschema.core.metapath.cst.math.Modulo; +import dev.metaschema.core.metapath.cst.math.Multiplication; +import dev.metaschema.core.metapath.cst.math.Negate; +import dev.metaschema.core.metapath.cst.math.Subtraction; +import dev.metaschema.core.metapath.cst.path.ContextItem; +import dev.metaschema.core.metapath.cst.path.FlagStep; +import dev.metaschema.core.metapath.cst.path.KindNodeTest; +import dev.metaschema.core.metapath.cst.path.ModelInstanceStep; +import dev.metaschema.core.metapath.cst.path.NameNodeTest; +import dev.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RelativeSlashPath; +import dev.metaschema.core.metapath.cst.path.RootDoubleSlashPath; +import dev.metaschema.core.metapath.cst.path.RootSlashOnlyPath; +import dev.metaschema.core.metapath.cst.path.RootSlashPath; +import dev.metaschema.core.metapath.cst.path.Step; +import dev.metaschema.core.metapath.cst.path.WildcardNodeTest; +import dev.metaschema.core.metapath.cst.type.Cast; +import dev.metaschema.core.metapath.cst.type.Castable; +import dev.metaschema.core.metapath.cst.type.InstanceOf; +import dev.metaschema.core.metapath.cst.type.Treat; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java b/core/src/main/java/dev/metaschema/core/metapath/cst/Let.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/Let.java index f10fd7f5e..a6836f973 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/Let.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/NamedFunctionReference.java b/core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/NamedFunctionReference.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java index 9056f9cf4..b565fad9e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/NamedFunctionReference.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.List; @@ -18,8 +18,8 @@ /** * The CST node for a Metapath - * variable - * reference. + * named + * function reference. */ public class NamedFunctionReference extends AbstractExpression { @@ -28,7 +28,7 @@ public class NamedFunctionReference private final int arity; /** - * Construct a new Metapath variable reference CST node. + * Construct a new Metapath named function reference CST node. * * @param text * the parsed text of the expression @@ -46,7 +46,7 @@ public NamedFunctionReference( } /** - * Get the variable name. + * Get the function name. * * @return the name of the referenced function */ diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StaticFunctionCall.java b/core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StaticFunctionCall.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java index 8a25e6a38..0627cd92d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StaticFunctionCall.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.function.Supplier; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java b/core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java index 407e314dc..78f826291 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractFilterExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractFilterExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java index 8477ba2e2..d1ae81177 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractFilterExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractBinaryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java index a92c96373..9fd393c22 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractLookup.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractLookup.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java index d3936efa9..81b897e7b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/AbstractLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IKeySpecifier; +import dev.metaschema.core.metapath.item.function.IMapItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java index 449039a35..9338d08d5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ArraySquareConstructor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ArraySquareConstructor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java index 0b781af90..348af2c11 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ArraySquareConstructor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; +package dev.metaschema.core.metapath.cst.items; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/DecimalLiteral.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/DecimalLiteral.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java index 0522c28ce..b65730813 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/DecimalLiteral.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import java.math.BigDecimal; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/EmptySequence.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/EmptySequence.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java index ba2efedde..f351313db 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/EmptySequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Except.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Except.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java index d22c8fa40..1cbe8eb6d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Except.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.HashSet; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ILiteralExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ILiteralExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java index 2130b9d9e..7af3d36fe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/ILiteralExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/IntegerLiteral.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/IntegerLiteral.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java index 80804e553..a0df2bdb5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/IntegerLiteral.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Intersect.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Intersect.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java index dafac4b64..fd98a46db 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Intersect.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/MapConstructor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/MapConstructor.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java index b8253e5cf..c53dd1845 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/MapConstructor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.items; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/PostfixLookup.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/PostfixLookup.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java index 7bd8f3900..46d0276a6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/PostfixLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IKeySpecifier; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Quantified.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Quantified.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java index fb3d380f3..11699e035 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Quantified.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.items; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Range.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Range.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java index 97eeb38a1..bf400bb45 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Range.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractBinaryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.math.BigInteger; import java.util.ArrayList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/SequenceExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/SequenceExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java index c9a098f2b..e05b5bd28 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/SequenceExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNAryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractNAryExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/SimpleMap.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/SimpleMap.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java index 51f797d58..a3f14a632 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/SimpleMap.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractBinaryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.items; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/StringConcat.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/StringConcat.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java index bc7ece894..c28977909 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/StringConcat.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNAryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnConcat; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractNAryExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.library.FnConcat; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/StringLiteral.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/StringLiteral.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java index 609b67e5e..71f130bd1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/StringLiteral.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/UnaryLookup.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/UnaryLookup.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java index c4e3bc93b..018684bbd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/UnaryLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IKeySpecifier; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Union.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Union.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java index fc4e07f16..9d6cecad0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/Union.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNAryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractNAryExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Stream; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/package-info.java new file mode 100644 index 000000000..21ec3df85 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/package-info.java @@ -0,0 +1,104 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides concrete syntax tree (CST) node implementations for Metapath item + * expressions and sequence operations. + *

    + * This package implements various expression types as defined by + * XPath 3.1 that operate on items + * and sequences, including literals, sequence constructors, set operations, and + * quantified expressions. + * + *

    Key Classes and Interfaces

    + * + *

    Literal Expressions

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.ILiteralExpression} - + * Common interface for all literal value expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.AbstractLiteralExpression} + * - Base class for literal implementations
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.IntegerLiteral} - Integer + * literal values
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.DecimalLiteral} - Decimal + * literal values
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.StringLiteral} - String + * literal values
      • + *
    + * + *

    Sequence Operations

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.EmptySequence} - Empty + * parenthesized expression {@code ()}
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.SequenceExpression} - + * Comma-separated sequence of expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.Range} - Range expression + * ({@code to} operator)
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.StringConcat} - String + * concatenation operator ({@code ||})
      • + *
    + * + *

    Set Operations

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.Union} - Union of sequences + * ({@code union}, {@code |})
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.Intersect} - Intersection + * of sequences ({@code intersect})
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.Except} - Difference of + * sequences ({@code except})
      • + *
    + * + *

    Map and Filter Operations

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.SimpleMap} - Simple map + * operator ({@code !})
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.AbstractFilterExpression} - + * Base class for filter expressions
      • + *
    + * + *

    Lookup Operations

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.AbstractLookup} - Base + * class for lookup operations
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.PostfixLookup} - Postfix + * lookup expression
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.UnaryLookup} - Unary lookup + * expression ({@code ?})
      • + *
    + * + *

    Array and Map Constructors

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.ArraySquareConstructor} - + * Square array constructor ({@code [ ]})
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor} - + * Curly array constructor ({@code array { }})
      • + *
    • {@link dev.metaschema.core.metapath.cst.items.MapConstructor} - Map + * constructor ({@code map { }})
      • + *
    + * + *

    Quantified Expressions

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.items.Quantified} - Quantified + * expressions ({@code some} and {@code every})
      • + *
    + * + *

    Usage Examples

    + * + * 
    + * // Literals: 42, 3.14, "hello"
+ * // Empty sequence: ()
+ * // Sequence: (1, 2, 3)
+ * // Range: 1 to 10
+ * // Union: $seq1 | $seq2
+ * // Simple map: $items ! string(.)
+ * // Quantified: some $x in $seq satisfies $x > 10
+ *
    + * + * @see dev.metaschema.core.metapath.item.IItem + * @see dev.metaschema.core.metapath.item.ISequence + * @see dev.metaschema.core.metapath.cst + */ + +package dev.metaschema.core.metapath.cst.items; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/AbstractComparison.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/AbstractComparison.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java index f17a9feb3..fb50efc9a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/AbstractComparison.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractBinaryExpression; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/And.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/And.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java index 1547621c6..48becba62 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/And.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNAryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractNAryExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/GeneralComparison.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/GeneralComparison.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java index 50db848ea..53b362394 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/GeneralComparison.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/IBooleanLogicExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/IBooleanLogicExpression.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/IBooleanLogicExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/IBooleanLogicExpression.java index 1f719c357..d62529611 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/IBooleanLogicExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/IBooleanLogicExpression.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; /** * A common interface for all expressions that produce a boolean result. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/If.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/If.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java index 23a3af543..40f8318a3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/If.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/Or.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/Or.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java index a82cfb29e..be8a0884a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/Or.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNAryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractNAryExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java index 5fc7229f2..b7ddf8b6e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.FocusContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathEvaluationFeature; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.cst.items.IntegerLiteral; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.logic; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.FocusContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.MetapathEvaluationFeature; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.cst.items.IntegerLiteral; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigInteger; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/ValueComparison.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/ValueComparison.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java index 43915a9f1..39053f5d7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/ValueComparison.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/package-info.java similarity index 58% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/logic/package-info.java index 48de61367..57c0f9893 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/package-info.java @@ -20,36 +20,36 @@ * *

    Logical Expressions

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.IBooleanLogicExpression} - * - Common interface for expressions that produce boolean results
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.And} - Logical - * "and" expression with short-circuit evaluation
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.Or} - Logical - * "or" expression with short-circuit evaluation
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.IBooleanLogicExpression} - + * Common interface for expressions that produce boolean results
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.And} - Logical "and" + * expression with short-circuit evaluation
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.Or} - Logical "or" + * expression with short-circuit evaluation
      • *
    * *

    Conditional Expressions

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.If} - - * If-then-else conditional expression
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.If} - If-then-else + * conditional expression
      • *
    * *

    Comparison Expressions

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.AbstractComparison} - * - Base class for all comparison operations
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.GeneralComparison} - * - General comparisons ({@code =}, {@code !=}, {@code <}, {@code <=}, - * {@code >}, {@code >=})
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.ValueComparison} - * - Value comparisons ({@code eq}, {@code ne}, {@code lt}, {@code le}, - * {@code gt}, {@code ge})
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.AbstractComparison} - Base + * class for all comparison operations
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.GeneralComparison} - + * General comparisons ({@code =}, {@code !=}, {@code <}, {@code <=}, {@code >}, + * {@code >=})
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.ValueComparison} - Value + * comparisons ({@code eq}, {@code ne}, {@code lt}, {@code le}, {@code gt}, + * {@code ge})
      • *
    * *

    Predicate Expressions

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.logic.PredicateExpression} - * - Predicate filter expression ({@code [predicate]})
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic.PredicateExpression} - + * Predicate filter expression ({@code [predicate]})
      • *
    * *

    Logical Expression Behavior

    @@ -88,9 +88,9 @@ * // Predicate: $items[position() < 5] * * - * @see gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem - * @see gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions - * @see gov.nist.secauto.metaschema.core.metapath.cst + * @see dev.metaschema.core.metapath.item.atomic.IBooleanItem + * @see dev.metaschema.core.metapath.function.ComparisonFunctions + * @see dev.metaschema.core.metapath.cst */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java index 95027e280..9416451e6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractBinaryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java index 6bed2941c..eeb9b97a4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; +package dev.metaschema.core.metapath.cst.math; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Addition.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Addition.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java index 6aceb1d79..af37534ef 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Addition.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; - -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.math; + +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Division.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Division.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java index 57ffde2e7..918d08485 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Division.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/IntegerDivision.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/IntegerDivision.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java index 24fe0e50e..bef67fc9c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/IntegerDivision.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Modulo.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Modulo.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java index 65af85c15..924bd0d98 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Modulo.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Multiplication.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Multiplication.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java index 87009d3b5..b0faab1c8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Multiplication.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; - -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.math; + +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Negate.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Negate.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java index 29063d2a7..1ad50ee08 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Negate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractUnaryExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractUnaryExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Subtraction.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Subtraction.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java index 11459263e..2b8e3d9b1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/Subtraction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; - -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.math; + +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/package-info.java new file mode 100644 index 000000000..4af6196e4 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/package-info.java @@ -0,0 +1,59 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides concrete syntax tree (CST) node implementations for Metapath + * arithmetic expressions. + *

    + * This package implements arithmetic operations as defined by the + * XPath 3.1 arithmetic + * expressions specification. These operations support numeric calculations, + * date/time arithmetic, and duration operations. + * + *

    Key Classes

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.math.AbstractArithmeticExpression} + * - Base class for all arithmetic operations
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.AbstractBasicArithmeticExpression} + * - Base class for basic binary arithmetic operations
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.Addition} - Addition + * operator (+)
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.Subtraction} - Subtraction + * operator (-)
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.Multiplication} - + * Multiplication operator (*)
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.Division} - Division + * operator (div)
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.IntegerDivision} - Integer + * division operator (idiv)
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.Modulo} - Modulo operator + * (mod)
      • + *
    • {@link dev.metaschema.core.metapath.cst.math.Negate} - Unary negation + * operator (-)
      • + *
    + * + *

    Supported Operations

    + *

    + * Arithmetic expressions in this package support operations on: + *

      + *
    • Numeric types (integer, decimal, float, double)
      • + *
    • Date and time types (date, dateTime, time)
      • + *
    • Duration types (yearMonthDuration, dayTimeDuration)
      • + *
    + * + *

    Usage Example

    + * + * 
    + * // Numeric: 1 + 2 evaluates to 3
+ * // Date arithmetic: xs:date('2023-01-01') + xs:yearMonthDuration('P1M')
+ * // Evaluates to xs:date('2023-02-01')
+ *
    + * + * @see dev.metaschema.core.metapath.item.atomic.INumericItem + * @see dev.metaschema.core.metapath.item.atomic.IDateItem + * @see dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem + */ + +package dev.metaschema.core.metapath.cst.math; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/cst/package-info.java new file mode 100644 index 000000000..e573c2fbf --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/package-info.java @@ -0,0 +1,59 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides concrete syntax tree (CST) node implementations for Metapath + * expressions. + *

    + * Metapath is an XPath 3.1-based query language for navigating and querying + * Metaschema-based data. This package contains the expression implementations + * that form the executable representation of parsed Metapath queries. + * + *

    Package Structure

    + *

    + * This package is organized into several subpackages: + *

      + *
    • {@link dev.metaschema.core.metapath.cst.math} - Arithmetic expressions + * (addition, subtraction, multiplication, division, etc.)
      • + *
    • {@link dev.metaschema.core.metapath.cst.path} - Path navigation + * expressions (axes, steps, node tests)
      • + *
    • {@link dev.metaschema.core.metapath.cst.type} - Type operations (cast, + * castable, instance of, treat)
      • + *
    • {@link dev.metaschema.core.metapath.cst.logic} - Boolean logic and + * comparison expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.items} - Literal values, + * sequences, and collection operations
      • + *
    + * + *

    Key Classes and Interfaces

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.AbstractExpression} - Base class + * for all CST expression nodes
      • + *
    • {@link dev.metaschema.core.metapath.cst.BuildCSTVisitor} - Transforms + * ANTLRv4 abstract syntax tree (AST) into executable CST nodes
      • + *
    • {@link dev.metaschema.core.metapath.cst.IExpressionVisitor} - Visitor + * pattern interface for processing CST nodes
      • + *
    • {@link dev.metaschema.core.metapath.cst.CSTPrinter} - Debugging utility + * for visualizing CST structure
      • + *
    • {@link dev.metaschema.core.metapath.cst.For} - For loop expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.Let} - Variable binding + * expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.StaticFunctionCall} - Static + * function invocation
      • + *
    + * + *

    Usage Context

    + *

    + * CST nodes are created by + * {@link dev.metaschema.core.metapath.cst.BuildCSTVisitor} during Metapath + * expression compilation. Each CST node implements + * {@link dev.metaschema.core.metapath.IExpression} and can be evaluated against + * a dynamic context to produce results. + * + * @see dev.metaschema.core.metapath.IExpression + * @see dev.metaschema.core.metapath.DynamicContext + */ + +package dev.metaschema.core.metapath.cst; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java index b9245bb07..fc15ef59e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java index f101d2f32..96c9731fa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.item.node.INodeItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java index 8d666042b..782dc4175 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.item.node.INodeItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java index c551e04b6..85958fd95 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.ICycledAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.ICycledAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractStepExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractStepExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java index 1d701aea2..42142d68e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractStepExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java index 1d4f0416d..10466dd97 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.function.Function; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ContextItem.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ContextItem.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java index 93551a2d1..43e91a32f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ContextItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/FlagStep.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/FlagStep.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java index fa916dda0..bd323e6ce 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/FlagStep.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INodeTestExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INodeTestExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java index b60515878..704a24764 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INodeTestExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/IWildcardMatcher.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/IWildcardMatcher.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java index 5e2d53556..cb2f70880 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/IWildcardMatcher.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import java.util.function.Predicate; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/KindNodeTest.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/KindNodeTest.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java index fb96519db..22d95a3c6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/KindNodeTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/MatchAnyLocalName.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/MatchAnyLocalName.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java index 1bf5b9bda..fcb42169f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/MatchAnyLocalName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/MatchAnyNamespace.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/MatchAnyNamespace.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java index defe0eeb6..4e270fdae 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/MatchAnyNamespace.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstanceStep.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstanceStep.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java index 8bcac7ef4..b9b0a6a77 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstanceStep.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/NameNodeTest.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/NameNodeTest.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java index feb2e847a..9c582f3c5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/NameNodeTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java index 5018ed60e..d44ee3bc7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java index 920778bda..f8f41bfda 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java index 3975f03bc..46c178e37 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java index e347213b6..875e66a7c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +package dev.metaschema.core.metapath.cst.path; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java index 762dedc09..8dbf84836 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java index 5e9570f85..b3a2b327d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.ItemUtils; -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; +package dev.metaschema.core.metapath.cst.path; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/WildcardNodeTest.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/WildcardNodeTest.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java index 730430aef..5440e58c8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/WildcardNodeTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.ItemUtils; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.function.Predicate; import java.util.stream.Stream; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/package-info.java new file mode 100644 index 000000000..814cf8471 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/package-info.java @@ -0,0 +1,76 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides concrete syntax tree (CST) node implementations for Metapath path + * navigation expressions. + *

    + * This package implements path expressions as defined by + * XPath 3.1 path + * expressions and XPath 3.1 + * axes. Path expressions enable navigation through Metaschema document + * structures using axes, steps, and predicates. + * + *

    Key Classes and Interfaces

    + * + *

    Path Expression Nodes

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.path.AbstractPathExpression} - + * Base class for all path expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.RootSlashPath} - Absolute + * path starting with {@code /}
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.RootSlashOnlyPath} - + * Root-only path expression {@code /}
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.RootDoubleSlashPath} - + * Absolute descendant path starting with {@code //}
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.RelativeSlashPath} - + * Relative path using {@code /} separator
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath} - + * Relative descendant path using {@code //} separator
      • + *
    + * + *

    Step Expressions

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.path.Step} - Individual step in a + * path expression combining axis and node test
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.Axis} - Enumeration of XPath + * axes (child, parent, ancestor, descendant, etc.)
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.ModelInstanceStep} - Step + * for navigating model instances (assembly/field children)
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.FlagStep} - Step for + * navigating flag children
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.ContextItem} - The context + * item expression {@code .}
      • + *
    + * + *

    Node Tests

    + *
      + *
    • {@link dev.metaschema.core.metapath.cst.path.INodeTestExpression} - + * Interface for node test expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.NameNodeTest} - Tests nodes + * by qualified name
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.KindNodeTest} - Tests nodes + * by kind (element, attribute, etc.)
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.WildcardNodeTest} - Wildcard + * node test ({@code *}, {@code prefix:*}, {@code *:local})
      • + *
    • {@link dev.metaschema.core.metapath.cst.path.IWildcardMatcher} - + * Interface for wildcard matching strategies
      • + *
    + * + *

    Usage Example

    + * + * 
    + * // Absolute path: /catalog/group/control
+ * // Descendant search: //control[@id='ac-1']
+ * // Relative path: parent/child
+ * // Context item: .
+ * // Wildcard: control/*
+ *
    + * + * @see dev.metaschema.core.metapath.item.node.INodeItem + * @see dev.metaschema.core.metapath.cst + */ + +package dev.metaschema.core.metapath.cst.path; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/AbstractCastingExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/AbstractCastingExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java index 3ac303a9d..9a6eabb6a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/AbstractCastingExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Cast.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Cast.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java index 684db07bb..21ab6a887 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Cast.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.type.IAtomicOrUnionType; +package dev.metaschema.core.metapath.cst.type; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Castable.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Castable.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java index 7d6b3b011..e3e83838a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Castable.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/InstanceOf.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/InstanceOf.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java index 8cb85d597..26550405a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/InstanceOf.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Treat.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Treat.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java index e49f7210f..5007d77cd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/Treat.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.type.ISequenceType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/TypeTestSupport.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/TypeTestSupport.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java index 6111ee4b7..352c45500 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/TypeTestSupport.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; - -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10Lexer; -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.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.cst.type; + +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.antlr.Metapath10; +import dev.metaschema.core.metapath.antlr.Metapath10Lexer; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/package-info.java similarity index 61% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/cst/type/package-info.java index ad0ae9c1f..e5a4c2286 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/type/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/package-info.java @@ -14,24 +14,22 @@ * *

    Key Classes

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.type.AbstractCastingExpression} - * - Base class for casting-related expressions
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.type.Cast} - - * Implements the "cast as" - * operator for explicit type conversion
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.type.Castable} - - * Implements the + *
    • {@link dev.metaschema.core.metapath.cst.type.AbstractCastingExpression} - + * Base class for casting-related expressions
      • + *
    • {@link dev.metaschema.core.metapath.cst.type.Cast} - Implements the + * "cast as" operator for + * explicit type conversion
      • + *
    • {@link dev.metaschema.core.metapath.cst.type.Castable} - Implements the * "castable as" * operator for testing type conversion feasibility
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.type.InstanceOf} - - * Implements the + *
    • {@link dev.metaschema.core.metapath.cst.type.InstanceOf} - Implements the * "instance of" * operator for runtime type testing
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.type.Treat} - - * Implements the "treat as" - * operator for type assertion with runtime verification
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.cst.type.TypeTestSupport} - * - Utility class for type testing operations
      • + *
    • {@link dev.metaschema.core.metapath.cst.type.Treat} - Implements the + * "treat as" operator + * for type assertion with runtime verification
      • + *
    • {@link dev.metaschema.core.metapath.cst.type.TypeTestSupport} - Utility + * class for type testing operations
      • *
    * *

    Type Operations

    @@ -73,9 +71,9 @@ * $value treat as xs:integer → returns $value if it's an integer, error otherwise * * - * @see gov.nist.secauto.metaschema.core.metapath.type - * @see gov.nist.secauto.metaschema.core.metapath.item.atomic - * @see gov.nist.secauto.metaschema.core.metapath.cst + * @see dev.metaschema.core.metapath.type + * @see dev.metaschema.core.metapath.item.atomic + * @see dev.metaschema.core.metapath.cst */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathFormatter.java rename to core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java index cb1c46573..3b1a8d963 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; -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.IDocumentNodeItem; -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.IRootAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathSegment.java b/core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathSegment.java rename to core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java index e480c3045..70f64e9b0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/IPathSegment.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IMetapathQueryable; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IMetapathQueryable; import java.util.List; import java.util.stream.Collectors; @@ -64,7 +64,8 @@ default List getPath() { /** * Get the value associated with the path segment. * - * @return the value or {@code} if no value is associated with this path segment + * @return the value or {@code null} if no value is associated with this path + * segment */ @Override INodeItem getNodeItem(); diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatter.java rename to core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java index df05619ce..98ea4fcfc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; - -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.IDocumentNodeItem; -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.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.format; + +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java rename to core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java index a513be1a8..b1ad22c30 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; -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.IDocumentNodeItem; -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.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -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.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/PathFormatSelection.java b/core/src/main/java/dev/metaschema/core/metapath/format/PathFormatSelection.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/PathFormatSelection.java rename to core/src/main/java/dev/metaschema/core/metapath/format/PathFormatSelection.java index 8c6193db7..f100bd431 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/PathFormatSelection.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/PathFormatSelection.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; /** * Enumeration of path format selection options for validation output. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatter.java rename to core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java index 9392e4eaf..a25f5b811 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; -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.IDocumentNodeItem; -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.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/format/package-info.java similarity index 70% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/format/package-info.java index 02f0e5cc7..586a57d2b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/package-info.java @@ -14,20 +14,20 @@ *

    * Key interfaces and classes: *

      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter} - - * Core interface defining the contract for path formatters with implementations - * for different path syntaxes
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.format.IPathSegment} - - * Represents a single segment in a path, providing navigation to parent - * segments and access to associated node items
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.format.MetapathFormatter} - * - Produces Metapath expression syntax for paths (e.g., + *
    • {@link dev.metaschema.core.metapath.format.IPathFormatter} - Core + * interface defining the contract for path formatters with implementations for + * different path syntaxes
      • + *
    • {@link dev.metaschema.core.metapath.format.IPathSegment} - Represents a + * single segment in a path, providing navigation to parent segments and access + * to associated node items
      • + *
    • {@link dev.metaschema.core.metapath.format.MetapathFormatter} - Produces + * Metapath expression syntax for paths (e.g., * {@code /root/assembly[1]/field[1]})
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.format.XPathFormatter} - - * Produces XPath 3.1 paths with EQName-qualified names (e.g., + *
    • {@link dev.metaschema.core.metapath.format.XPathFormatter} - Produces + * XPath 3.1 paths with EQName-qualified names (e.g., * {@code /Q{http://example.com}root/Q{http://example.com}assembly[1]})
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.format.JsonPointerFormatter} - * - Produces RFC 6901 JSON Pointer paths (e.g., + *
    • {@link dev.metaschema.core.metapath.format.JsonPointerFormatter} - + * Produces RFC 6901 JSON Pointer paths (e.g., * {@code /root/assemblies/0/id})
      • *
    *

    @@ -69,4 +69,4 @@ * across multiple formatting operations. */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArgumentImpl.java b/core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArgumentImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java index 4ce49e68e..fdb218c1c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArgumentImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java index 3d7336f04..ded37b725 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.IErrorCode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/CalledContext.java b/core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/CalledContext.java rename to core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java index 84db6d665..2bbc05abe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/CalledContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.List; import java.util.Objects; @@ -99,9 +99,6 @@ public boolean equals(Object obj) { return false; } CalledContext other = (CalledContext) obj; - if (!getFunction().equals(other.getFunction())) { - return false; - } return Objects.equals(function, other.function) && Objects.equals(arguments, other.arguments) && Objects.equals(contextItem, other.contextItem); diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/CastFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/CastFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java index 6c853b1fd..96fe7d3a1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/CastFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java b/core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java rename to core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java index 99b17df58..6ff356769 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnNot; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.function.library.FnNot; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java index a39b9a4b9..5fc36bc44 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.IErrorCode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java rename to core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java index 9fb480b3a..be03342b8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.function.impl.AbstractFunction; -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.type.ISequenceType; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.function.impl.AbstractFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.ISequenceType; import java.util.Collections; import java.util.EnumSet; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java index c473d47b2..33d4227ed 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnDoc; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.function.library.FnDoc; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java rename to core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java index 7fc044b75..916bc4a8f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionMetapathError.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionMetapathError.java rename to core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java index 07f5a0cca..ee1e3a53e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionMetapathError.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.MetapathException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java rename to core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java index 8d5f04676..fed96c5fd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.ServiceLoader; import java.util.ServiceLoader.Provider; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java rename to core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java index 24daee6c5..e3996a86e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.HashMap; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java b/core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java rename to core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java index 710ad98e4..58383f422 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; - -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function; + +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java rename to core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java index b77f2995f..6742bd31f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.EnumSet; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionExecutor.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionExecutor.java rename to core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java index 606d3c630..bcb755ed6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionExecutor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java rename to core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java index dd553c153..eeac0d8bd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionResolver.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionResolver.java rename to core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java index 5fa82dd44..79f8fa65b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionResolver.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java index 6d3d02d65..de490ac84 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.IErrorCode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java index bf35f11e5..d1c2c7138 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.node.INodeItem; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java index 52a4f36e0..b69d66866 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; /** * FORG0001: Thrown when a cast operation fails because the supplied value diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/JsonFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/JsonFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java index 283f71176..c48f3b214 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/JsonFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.IErrorCode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UnidentifiedFunctionError.java b/core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UnidentifiedFunctionError.java rename to core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java index fab1bed39..806cfcd49 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UnidentifiedFunctionError.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.IErrorCode; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java index d0d993796..ad21e47f8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnResolveUri; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.function.library.FnResolveUri; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/AbstractFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/AbstractFunction.java rename to core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java index 4773aac3f..25ba8be8b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/AbstractFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.impl; - -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.function.CalledContext; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -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.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +package dev.metaschema.core.metapath.function.impl; + +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.function.CalledContext; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/OperationFunctions.java b/core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/OperationFunctions.java rename to core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java index a52851d04..d2a7c27f7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/OperationFunctions.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java @@ -3,30 +3,30 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.impl; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.function.ArithmeticFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.CastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnDateTime; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.impl; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.ArithmeticFunctionException; +import dev.metaschema.core.metapath.function.CastFunctionException; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.library.FnDateTime; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.Duration; import java.time.LocalDate; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/function/impl/package-info.java similarity index 63% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/function/impl/package-info.java index 92a5d282b..ed5475fc9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/impl/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/impl/package-info.java @@ -8,19 +8,18 @@ *

    * This package contains base classes and utilities used internally by the * function library implementations in - * {@link gov.nist.secauto.metaschema.core.metapath.function.library}. These - * classes provide common functionality for function execution, argument - * conversion, and type checking based on the XPath 3.1 function calling - * conventions. + * {@link dev.metaschema.core.metapath.function.library}. These classes provide + * common functionality for function execution, argument conversion, and type + * checking based on the XPath 3.1 function calling conventions. *

    * Key implementation classes: *

      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.impl.AbstractFunction} - * - Base class for all function implementations, providing argument conversion, + *
    • {@link dev.metaschema.core.metapath.function.impl.AbstractFunction} - + * Base class for all function implementations, providing argument conversion, * type promotion, focus dependency handling, and result caching for * deterministic functions
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions} - * - Utility class for registering mathematical and logical operation functions + *
    • {@link dev.metaschema.core.metapath.function.impl.OperationFunctions} - + * Utility class for registering mathematical and logical operation functions * used by Metapath operators
      • *
    *

    @@ -41,10 +40,10 @@ * directly referenced by application code. Function implementations should * extend {@code AbstractFunction} and be registered in a function library. * - * @see gov.nist.secauto.metaschema.core.metapath.function - * @see gov.nist.secauto.metaschema.core.metapath.function.library + * @see dev.metaschema.core.metapath.function + * @see dev.metaschema.core.metapath.function.library * @see XPath 3.1: * Function Calls */ -package gov.nist.secauto.metaschema.core.metapath.function.impl; +package dev.metaschema.core.metapath.function.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppend.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppend.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java index 0cb5afcee..4e8c01f08 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppend.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlatten.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlatten.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java index 07f498403..8ea02a9c9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlatten.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGet.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGet.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java index 4b2fa7b92..f71b60b8e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGet.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHead.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHead.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java index 8abf3cdbc..9de36bd61 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHead.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBefore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBefore.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java index b13cc1a11..d4b16edf8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBefore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; +import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoin.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoin.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java index 8ed1e4483..cd2cad41c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoin.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPut.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPut.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java index 88a3945b0..987587d46 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPut.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; +import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemove.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemove.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java index 25ca67687..efdd56b56 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemove.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; +import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.HashSet; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverse.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverse.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java index 010cfcd32..2f92d93e0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverse.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySize.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java similarity index 67% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySize.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java index 574b7caff..808aae575 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySize.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarray.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarray.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java index a1aeb4757..c94e2b1ad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarray.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.ICollectionValue; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; +import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTail.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTail.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java index 0f87fdf42..3be7920f8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTail.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java index 7d69294f4..cafcbf779 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IFunctionExecutor; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.IFunctionExecutor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java index 5214af4f7..687050bc8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import gov.nist.secauto.metaschema.core.datatype.DataTypeService; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.datatype.DataTypeService; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionLibrary; +import dev.metaschema.core.metapath.item.atomic.INumericItem; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java index 943a5f924..6780b1e0b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java index 320ff1fe0..3fe3d3cb9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java index ed6177758..1c3a26c72 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java index eafd60e3b..f01257d9d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java index 270b5608f..c015c8995 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.impl.OperationFunctions; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java index 6e32f53c8..2892a36a6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java index fc523ee1a..ad3700bf7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -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.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java index 59354697d..94f0a7a3b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java index daa9b740d..9d614e016 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java index 1d71b46ac..8e83767cb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnContains.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnContains.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java index 8c43dc82e..2a851fc95 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnContains.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCount.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCount.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java index 36d86f8ec..43adfc3ce 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCount.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentDate.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java index ec7213020..4c6cb85c4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IFunction; -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.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java index 28a4583fa..fe7b36faf 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IFunction; -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.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java index 9c23260d5..7883ca260 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IFunction; -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.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java index ba706a8a2..fc6dbb91b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java index 503191cd2..24a085cdf 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.util.ObjectUtils; import java.time.ZoneId; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDate.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java index 52c0f1851..535ec8704 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java index 76d3a41b0..05007fb57 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDaysFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDaysFromDuration.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java index a8a882153..d7755f757 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDaysFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDeepEqual.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDeepEqual.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java index 14c536402..5860a369c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDeepEqual.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguage.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguage.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java index a2038b7a0..77782fc69 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguage.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IFunction; -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.IStringItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDistinctValues.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDistinctValues.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java index 8afcf028b..61f986f62 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDistinctValues.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java index 680c29351..8c38b2d18 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.MetapathException; -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.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.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.MetapathException; +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.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.node.IDocumentNodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.io.IOException; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentAvailable.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentAvailable.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java index b64ab2ab4..dbf1aaf5d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentAvailable.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.MetapathException; -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.UriFunctionException; -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.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.MetapathException; +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.UriFunctionException; +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.util.ObjectUtils; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java index b35502d4b..451a3dbad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.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.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEmpty.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEmpty.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java index 33abc9d53..9c71fbe4e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEmpty.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEndsWith.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEndsWith.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java index fdd8c75ff..085d8f732 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEndsWith.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExactlyOne.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExactlyOne.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java index 3cd9e8616..36d39ac70 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExactlyOne.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExists.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java similarity index 70% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExists.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java index 5eac41385..4c40a8535 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExists.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFalse.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFalse.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java index 20f5e24a3..a9830ec5d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFalse.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.IFunction; -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.IBooleanItem; +package dev.metaschema.core.metapath.function.library; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionArity.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionArity.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java index d46fdd040..53f0502ba 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionArity.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionLookup.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionLookup.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java index 9c315f206..9b30252b0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.StaticMetapathException; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IQNameItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.StaticMetapathException; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IQNameItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java similarity index 67% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionName.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java index 95edbcf62..bf7dceb42 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IQNameItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IQNameItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHasChildren.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHasChildren.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java index 752c0c51c..a9bb342f7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHasChildren.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -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.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHead.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHead.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java index 6f68e5be3..c8af015fa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHead.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java index 2c5bae75c..c7da6e899 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDuration.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java index e83b8781d..8dd0ad399 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java index 0b4e367c0..ffd8eb1b1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnImplicitTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnImplicitTimezone.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java index 3e1a813b0..5aea1d703 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnImplicitTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IFunction; -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.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.util.ObjectUtils; import java.time.Duration; import java.time.ZoneId; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnIndexOf.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnIndexOf.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java index c089abeba..a295f95e2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnIndexOf.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.ComparisonFunctions; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInnermost.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInnermost.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java index 5c46cb9c3..ddf7d1dd5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInnermost.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java index 52f118aa8..3e4a57713 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLast.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLast.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java index cc51c2d63..128bc8f46 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLast.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.FocusContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.IIntegerItem; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.FocusContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLocalName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLocalName.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java index a03bdad24..18aeeac54 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLocalName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLowerCase.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLowerCase.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java index 53df351e9..3c38bff48 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLowerCase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMatches.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMatches.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java index 70338d601..b4913dbca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMatches.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.regex.RegexUtil; -import gov.nist.secauto.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.regex.RegexUtil; +import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java index 84268cddc..8a65c384a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.ComparisonFunctions; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java index 25abc197f..cfed1db4a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDuration.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java index 4a93fa1c4..fc4297020 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java index 66ef5041b..2034ede6c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDate.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java index 3566a8fea..65a766f81 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java index 059ea3a17..28669a748 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthsFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthsFromDuration.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java index 7f27303fd..aec3c417c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthsFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnName.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java index ba2f83cdf..2707c68ab 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.StaticContext; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.StaticContext; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNamespaceUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNamespaceUri.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java index 2910ff1d5..36d11af40 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNamespaceUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNormalizeSpace.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNormalizeSpace.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java index ab93eb232..bbb0fc7c8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNormalizeSpace.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNot.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNot.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java index c89dc240f..d552ebda7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNot.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOneOrMore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOneOrMore.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java index d44207078..513bcdf57 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOneOrMore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOutermost.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOutermost.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java index 79c6d1a1d..8636ca8f8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOutermost.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.HashSet; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java index 9bdbdc28f..1472ced03 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.format.IPathFormatter; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -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.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPosition.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPosition.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java index 433e8ddd3..4d6651993 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPosition.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.FocusContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.IIntegerItem; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.FocusContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnQName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnQName.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java index 7e12f2ff2..cb93ce70d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnQName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.CastFunctionException; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IQNameItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.CastFunctionException; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IQNameItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java index 3726741ce..cd07f5e00 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java index 50bc0909c..e735a88bd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.UriFunctionException; -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.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.function.UriFunctionException; +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.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java index 4e852653e..dcdd620f1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRoot.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRoot.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java index 00e521cba..d210dc482 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRoot.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java index 6ec69c8d3..b11b6d096 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java index 4d604eeb1..7c835f158 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDuration.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java index 462f6a5da..9c99eaf20 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.time.Duration; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java index 69f92d40c..f7cae5605 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.time.Duration; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java index 7baae01b4..2655fb79a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java index 84f25bcc2..c0de82929 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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 dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +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 java.net.URI; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnString.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnString.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java index e1d4e0024..a2d662848 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnString.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.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.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringJoin.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringJoin.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java index d6f8fa1b1..f8e31b9c0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringJoin.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringLength.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringLength.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java index cc9d012a1..9f6d86631 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringLength.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstring.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstring.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java index 7a727bd50..addcf93f2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstring.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringAfter.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringAfter.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java index b52e8f6e3..955fef2d1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringAfter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringBefore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringBefore.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java index 32c40f676..c3d3569d5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringBefore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java index a9d8d2f5c..94b91a4a5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.impl.OperationFunctions; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java index 4583ec7de..a2303bc02 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDate.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java index 22958dd7a..0d4043b66 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java index 7165e6482..cb335504a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java index 99921d2f0..112d87e73 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTokenize.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTokenize.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java index bab9f2435..45a54a524 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTokenize.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.regex.RegexUtil; -import gov.nist.secauto.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; -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.IStringItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.regex.RegexUtil; +import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTrue.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTrue.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java index b1ba91d00..6768ebfff 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTrue.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.IFunction; -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.IBooleanItem; +package dev.metaschema.core.metapath.function.library; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnUpperCase.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnUpperCase.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java index 2ff840f83..b2820367b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnUpperCase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDate.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java index c68ee061f..6a3b8668c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTime.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java index 21fd7c1c7..66bd4bf4b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearsFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearsFromDuration.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java index 4ab672415..e98a3c65a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearsFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnZeroOrOne.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnZeroOrOne.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java index ed6dc3519..b4ce8832e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnZeroOrOne.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContains.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContains.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java index aff55b8dc..3098afa8f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContains.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntry.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntry.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java index 3c22d0e96..6627f4599 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntry.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFind.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFind.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java index 7f5d63dc8..c8ff2f152 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFind.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapForEach.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapForEach.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java index 090302ec8..37acb4242 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapForEach.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.function.BiFunction; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGet.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGet.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java index 5c7b62396..94cb54ad3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGet.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeys.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeys.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java index eb93b21e0..53304161b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeys.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMerge.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMerge.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java index eb2aff8d9..728a5854f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMerge.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.JsonFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.JsonFunctionException; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPut.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPut.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java index a7e058ca9..89c63b36c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPut.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemove.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemove.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java index 4c5b63ab8..9240fbeca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemove.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSize.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSize.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java index 53623c773..2c14d562b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSize.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.FunctionUtils; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64Decode.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java similarity index 64% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64Decode.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java index df00829a6..0ea04e93c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64Decode.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64Encode.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java similarity index 63% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64Encode.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java index d1dd98202..29934c9d2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64Encode.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java index 79d82a68a..860ecc514 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.function.library; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java index 549a6ddc3..26180806d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.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.IFunctionExecutor; -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.INumericItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.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.IFunctionExecutor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/package-info.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/function/library/package-info.java index b710f9558..4c721be63 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/package-info.java @@ -44,23 +44,23 @@ * This package also includes Metapath-specific functions not present in XPath * 3.1: *

      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.library.MpRecurseDepth} - * - Recursively evaluates a Metapath expression to a specified depth
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.library.MpBase64Encode} - * - Encodes strings to Base64
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.library.MpBase64Decode} - * - Decodes Base64 strings
      • + *
    • {@link dev.metaschema.core.metapath.function.library.MpRecurseDepth} - + * Recursively evaluates a Metapath expression to a specified depth
      • + *
    • {@link dev.metaschema.core.metapath.function.library.MpBase64Encode} - + * Encodes strings to Base64
      • + *
    • {@link dev.metaschema.core.metapath.function.library.MpBase64Decode} - + * Decodes Base64 strings
      • *
    * *

    Function Registration

    *

    * All built-in functions are registered in - * {@link gov.nist.secauto.metaschema.core.metapath.function.library.DefaultFunctionLibrary}, + * {@link dev.metaschema.core.metapath.function.library.DefaultFunctionLibrary}, * which is loaded via the Java ServiceLoader mechanism. * * @see XPath and XQuery * Functions and Operators 3.1 - * @see gov.nist.secauto.metaschema.core.metapath.function + * @see dev.metaschema.core.metapath.function */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/function/package-info.java new file mode 100644 index 000000000..6caf9280e --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/function/package-info.java @@ -0,0 +1,46 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides the core framework for defining and executing Metapath functions. + *

    + * This package contains the foundational interfaces and classes for + * implementing functions that can be called within Metapath expressions. It + * supports function registration, resolution, and execution based on the XPath + * 3.1 function model. + * + *

    Key Interfaces

    + *
      + *
    • {@link dev.metaschema.core.metapath.function.IFunction} - Represents a + * function signature with its name, arguments, return type, and properties
      • + *
    • {@link dev.metaschema.core.metapath.function.IFunctionLibrary} - Provides + * access to a collection of function signatures
      • + *
    • {@link dev.metaschema.core.metapath.function.IFunctionExecutor} - + * Executes a function with provided arguments
      • + *
    • {@link dev.metaschema.core.metapath.function.IArgument} - Represents a + * single function argument signature
      • + *
    + * + *

    Key Classes

    + *
      + *
    • {@link dev.metaschema.core.metapath.function.DefaultFunction} - Concrete + * implementation of a function signature
      • + *
    • {@link dev.metaschema.core.metapath.function.FunctionService} - + * Service-based function discovery using Java ServiceLoader
      • + *
    • {@link dev.metaschema.core.metapath.function.FunctionLibrary} - Registry + * for organizing and looking up functions
      • + *
    + * + *

    Usage

    + *

    + * Functions are registered in libraries and resolved by name and arity during + * Metapath expression evaluation. The {@code FunctionService} loads function + * libraries using the Java ServiceLoader mechanism, making them available to + * the Metapath evaluator. + * + * @see dev.metaschema.core.metapath.function.library + */ + +package dev.metaschema.core.metapath.function; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/RegexUtil.java b/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegexUtil.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/RegexUtil.java rename to core/src/main/java/dev/metaschema/core/metapath/function/regex/RegexUtil.java index 5768e41b6..21951832c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/RegexUtil.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegexUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.regex; +package dev.metaschema.core.metapath.function.regex; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java index f89656e6f..face0d6af 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.regex; +package dev.metaschema.core.metapath.function.regex; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.MetapathException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/function/regex/package-info.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/function/regex/package-info.java index 66803044c..1d9e57d16 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/regex/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/regex/package-info.java @@ -13,10 +13,9 @@ * *

    Key Classes

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.regex.RegexUtil} - * - Utility methods for parsing XPath regex flags and creating Java Pattern - * objects
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.function.regex.RegularExpressionMetapathException} + *
    • {@link dev.metaschema.core.metapath.function.regex.RegexUtil} - Utility + * methods for parsing XPath regex flags and creating Java Pattern objects
      • + *
    • {@link dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException} * - Exception thrown when regular expression processing fails
      • *
    * @@ -40,7 +39,7 @@ * * @see XPath * 3.1 Regular Expression Syntax - * @see gov.nist.secauto.metaschema.core.metapath.function.library + * @see dev.metaschema.core.metapath.function.library */ -package gov.nist.secauto.metaschema.core.metapath.function.regex; +package dev.metaschema.core.metapath.function.regex; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractDecimalMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractDecimalMapKey.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractDecimalMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/AbstractDecimalMapKey.java index 694726d6c..99ccf8286 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractDecimalMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractDecimalMapKey.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.item.function.IDecimalMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IDecimalMapKey; +import dev.metaschema.core.metapath.item.function.IMapKey; /** * An implementation of a {@link IMapKey} that uses a string-based value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java index 4e5e70d61..3176f77c3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IMapKey; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMetapathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java index 12a9ab556..f1c6c2923 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.CollectionUtil; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractSequence.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractSequence.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java index dc4788da1..85644c8ad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractSequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.Iterator; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ErrorCodeImpl.java b/core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ErrorCodeImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java index 460cea94e..5340506b4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ErrorCodeImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.IErrorCode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java b/core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java index 61879720f..e1431ebe6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.util.ObjectUtils; import java.util.EnumSet; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java index a9aa59d9a..38b831033 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidMetapathGrammarException; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/MetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/MetapathExpression.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java index 24359251d..a07ebf82a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/MetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidMetapathGrammarException; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.antlr.FailingErrorListener; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10Lexer; -import gov.nist.secauto.metaschema.core.metapath.antlr.ParseTreePrinter; -import gov.nist.secauto.metaschema.core.metapath.cst.BuildCSTVisitor; -import gov.nist.secauto.metaschema.core.metapath.cst.CSTPrinter; -import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.impl; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.antlr.FailingErrorListener; +import dev.metaschema.core.metapath.antlr.Metapath10; +import dev.metaschema.core.metapath.antlr.Metapath10Lexer; +import dev.metaschema.core.metapath.antlr.ParseTreePrinter; +import dev.metaschema.core.metapath.cst.BuildCSTVisitor; +import dev.metaschema.core.metapath.cst.CSTPrinter; +import dev.metaschema.core.metapath.cst.path.ContextItem; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SequenceN.java b/core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SequenceN.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java index 4e04d1097..fa7da87ba 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SequenceN.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SingletonSequence.java b/core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SingletonSequence.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java index ce9c72c42..c4608a540 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SingletonSequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.util.CollectionUtil; import java.util.List; import java.util.function.Consumer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/StreamSequence.java b/core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/StreamSequence.java rename to core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java index 7b89c144e..66e1a30a7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/StreamSequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.impl; +package dev.metaschema.core.metapath.impl; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/impl/package-info.java new file mode 100644 index 000000000..fb3aa72a7 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/package-info.java @@ -0,0 +1,49 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Internal implementation classes supporting the Metapath expression engine. + *

    + * This package contains concrete implementations of core Metapath abstractions + * including expression compilation, evaluation, sequence management, and error + * handling. These classes are primarily used internally by the Metapath + * evaluator and are subject to change between releases. + *

    + * Key implementation classes: + *

      + *
    • {@link dev.metaschema.core.metapath.impl.MetapathExpression} - Main + * implementation of {@link dev.metaschema.core.metapath.IMetapathExpression}, + * providing expression compilation from Metapath strings using ANTLR4 parsing + * and CST generation
      • + *
    • {@link dev.metaschema.core.metapath.impl.LazyCompilationMetapathExpression} + * - Defers expression compilation until first evaluation for performance + * optimization
      • + *
    • {@link dev.metaschema.core.metapath.impl.AbstractSequence} - Base class + * for immutable sequence implementations backed by unmodifiable lists
      • + *
    • {@link dev.metaschema.core.metapath.impl.SingletonSequence} - Optimized + * sequence containing exactly one item
      • + *
    • {@link dev.metaschema.core.metapath.impl.SequenceN} - General-purpose + * sequence containing zero or more items
      • + *
    • {@link dev.metaschema.core.metapath.impl.StreamSequence} - Lazy sequence + * backed by a stream for efficient memory usage with large result sets
      • + *
    • {@link dev.metaschema.core.metapath.impl.ErrorCodeImpl} - Implementation + * of {@link dev.metaschema.core.metapath.IErrorCode} for Metapath error + * reporting
      • + *
    • {@link dev.metaschema.core.metapath.impl.AbstractMapKey} - Base class for + * map key implementations used in Metapath map operations
      • + *
    • {@link dev.metaschema.core.metapath.impl.IFeatureCollectionFunctionItem} + * - Support for function items in map/array collections
      • + *
    + *

    + * This package is considered an implementation detail and should not be + * directly referenced by application code. Use the public API in + * {@link dev.metaschema.core.metapath} instead. + * + * @see dev.metaschema.core.metapath + * @see dev.metaschema.core.metapath.IMetapathExpression + * @see dev.metaschema.core.metapath.item.ISequence + */ + +package dev.metaschema.core.metapath.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/DefaultItemWriter.java b/core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/DefaultItemWriter.java rename to core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java index b902793dd..c97b11525 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/DefaultItemWriter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; - -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAtomicValuedItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +package dev.metaschema.core.metapath.item; + +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.node.INodeItem; import org.eclipse.jdt.annotation.Owning; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ICollectionValue.java b/core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ICollectionValue.java rename to core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java index 94f772829..237d8330e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ICollectionValue.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; +package dev.metaschema.core.metapath.item; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/IItem.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/IItem.java index 7c63df0b3..d198fa097 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/IItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; +package dev.metaschema.core.metapath.item; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItemVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java index 3e626b8c3..3cc1188ea 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; +package dev.metaschema.core.metapath.item; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItemWriter.java b/core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItemWriter.java rename to core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java index a4c380dad..ba33c3853 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItemWriter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; +package dev.metaschema.core.metapath.item; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ISequence.java b/core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ISequence.java rename to core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java index c50e88156..3e6908b04 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ISequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; - -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractSequence; -import gov.nist.secauto.metaschema.core.metapath.impl.SequenceN; -import gov.nist.secauto.metaschema.core.metapath.impl.SingletonSequence; -import gov.nist.secauto.metaschema.core.metapath.impl.StreamSequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item; + +import dev.metaschema.core.metapath.impl.AbstractSequence; +import dev.metaschema.core.metapath.impl.SequenceN; +import dev.metaschema.core.metapath.impl.SingletonSequence; +import dev.metaschema.core.metapath.impl.StreamSequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ItemUtils.java b/core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ItemUtils.java rename to core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java index d3938c03f..d2be04fc4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/ItemUtils.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item; +package dev.metaschema.core.metapath.item; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.cst.path.Axis; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentBasedNodeItem; -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.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; +import dev.metaschema.core.metapath.cst.path.Axis; +import dev.metaschema.core.metapath.item.node.IDocumentBasedNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java index 56b71a24a..f6b4b0f24 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java index 6b5b908bc..6943ef01d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java index 6d0b1a78b..faf2b05cb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java index 628337e59..13b766bdb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.atomic; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java index f2d333923..7f63e645f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AnyUriItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.AnyUriItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAtomicValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAtomicValuedItem.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAtomicValuedItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAtomicValuedItem.java index 848afbb8c..ddced534b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAtomicValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAtomicValuedItem.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItem; /** * This marker interface identifies a valued {@link IItem} type that has an diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java index a62a945db..ff02d391f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; - -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.Base64BinaryItemImpl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IBinaryItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +package dev.metaschema.core.metapath.item.atomic; + +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.Base64BinaryItemImpl; +import dev.metaschema.core.metapath.item.atomic.impl.IBinaryItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import java.nio.ByteBuffer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBooleanItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBooleanItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java index 41d2332c3..275d13caa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBooleanItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.BooleanItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.BooleanItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ICalendarTemporalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ICalendarTemporalItem.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ICalendarTemporalItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/ICalendarTemporalItem.java index 69de60724..03957b96a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ICalendarTemporalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ICalendarTemporalItem.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; import java.time.ZoneOffset; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java index 24f491341..702d4ef13 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDate; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDateTime; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateWithoutTimeZoneItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.object.AmbiguousDate; +import dev.metaschema.core.datatype.object.AmbiguousDateTime; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.DateWithoutTimeZoneItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalDate; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java index f20b4c284..d58a92b52 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; - -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDateTime; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateTimeWithoutTimeZoneItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.atomic; + +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.object.AmbiguousDateTime; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.DateTimeWithoutTimeZoneItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java index 833df29e1..9c3e27dde 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateTimeWithTimeZoneItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.DateTimeWithTimeZoneItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java index cd8576a23..cf7585713 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateWithTimeZoneItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.DateWithTimeZoneItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java index 1e898cc7c..814abeecf 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; - -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DayTimeDurationItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.atomic; + +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.DayTimeDurationItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.Duration; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java index 685836d47..78f23a19a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.ArithmeticFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.CastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DecimalItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.ArithmeticFunctionException; +import dev.metaschema.core.metapath.function.CastFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.DecimalItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDurationItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java index 2e29869d1..8904fcaf1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.AbstractDurationAdapter; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.impl.TypeConstants; +import dev.metaschema.core.datatype.adapter.AbstractDurationAdapter; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.impl.TypeConstants; import java.time.temporal.TemporalAmount; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IEmailAddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IEmailAddressItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java index 66f99007f..7ef067ebb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IEmailAddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.EmailAddressItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.EmailAddressItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IHexBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IHexBinaryItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java index e2a8d0e3f..d0608ff6b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IHexBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.HexBinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IBinaryItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.HexBinaryItem; +import dev.metaschema.core.metapath.item.atomic.impl.IBinaryItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import java.nio.ByteBuffer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IHostnameItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IHostnameItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java index 51b1aa1cf..ddb529142 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IHostnameItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.HostnameItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.HostnameItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java index 84160af8b..45524ae3f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.impl.TypeConstants; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.impl.TypeConstants; import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.IPAddress; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java index 9b1f7ba1b..5423bae44 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IPv4AddressItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.IPv4AddressItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv4.IPv4Address; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java index 776389dab..d83cee1e3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IPv6AddressItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.IPv6AddressItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv6.IPv6Address; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java index 07ad67aa1..699376fb2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.ArithmeticFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.CastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IntegerItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.ArithmeticFunctionException; +import dev.metaschema.core.metapath.function.CastFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.IntegerItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java index f91c5759c..e4b0c0d2b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.markup.IMarkupString; +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupLineItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupLineItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java index 587aac901..6c63ba36b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupLineItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.MarkupLineItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.MarkupLineItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java index 0d39b4b58..10b72e850 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.MarkupMultiLineItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.MarkupMultiLineItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INcNameItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INcNameItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java index 0bf70c40c..5b0b5c1e3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INcNameItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.NcNameItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.NcNameItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java index a740b4d70..c094c8890 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.NonNegativeIntegerItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.NonNegativeIntegerItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INumericItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INumericItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java index 4829a6762..36dbc6771 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INumericItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.metapath.function.ArithmeticFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.CastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.impl.OperationFunctions; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.impl.TypeConstants; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.function.ArithmeticFunctionException; +import dev.metaschema.core.metapath.function.CastFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.function.impl.OperationFunctions; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.impl.TypeConstants; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java index 6366c77be..9dc465f8c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.PositiveIntegerItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.PositiveIntegerItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IQNameItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IQNameItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java index bb69d68f4..5c52e6f89 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IQNameItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.QNameItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.QNameItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IStringItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IStringItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java index cfb1f6c30..62ed12109 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IStringItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.StringItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.StringItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITemporalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITemporalItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java index 95101702d..d181e1f04 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITemporalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.util.ObjectUtils; import java.time.Duration; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITimeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java index 72195f8b0..7dd33200f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousTime; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.TimeWithoutTimeZoneItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.object.AmbiguousTime; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.TimeWithoutTimeZoneItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.LocalTime; import java.time.OffsetTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java index 6a4236c53..96a5d6e1d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.TimeWithTimeZoneItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.TimeWithTimeZoneItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.OffsetTime; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITokenItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITokenItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java index 79fb74651..f1e70aee2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITokenItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.TokenItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.TokenItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUntypedAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUntypedAtomicItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUntypedAtomicItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUntypedAtomicItem.java index 35aacf25d..f0b680223 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUntypedAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUntypedAtomicItem.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; /** * An atomic Metapath item containing an untyped atomic data value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUriReferenceItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUriReferenceItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java index c0a5a160f..b684f9e88 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUriReferenceItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.UriReferenceItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.UriReferenceItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUuidItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUuidItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java index c7611b071..177b035d9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUuidItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.UuidItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.UuidItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import java.util.UUID; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java index 5fb1e5e26..fed06bf02 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; - -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.YearMonthDurationItemImpl; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.atomic; + +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.atomic.impl.YearMonthDurationItemImpl; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.time.Period; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java index 84f15eabb..1114d6b1d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import java.nio.ByteBuffer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java index c71c4c2e7..845511bfe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.ICalendarMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.function.ICalendarMapKey; +import dev.metaschema.core.metapath.item.function.IMapKey; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java index da852ab86..c8c0703df 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.ICalendarMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.function.ICalendarMapKey; +import dev.metaschema.core.metapath.item.function.IMapKey; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java index d9d6494ee..bcb1194e7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractDecimalMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.impl.AbstractDecimalMapKey; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java index f39097a6f..8a8ecf815 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import java.time.temporal.TemporalAmount; import java.util.Comparator; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java index f13d7427f..58085c5d3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPAddressItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IIPAddressItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.IPAddress; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java index 5dbcc81cc..9097b81b6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java index 95d10fb37..d4373e013 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; +import dev.metaschema.core.datatype.markup.IMarkupString; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IMarkupItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java index 682757f3e..fe9cdb232 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java index 2b79c0030..4855c1723 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITemporalItem; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.ITemporalItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java index eef270aa2..b948e49cf 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.ITemporalMapKey; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.ITemporalMapKey; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java index 9234e9ff2..fef91f1a3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java index 7df2600cb..af3cab7fd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.UriAdapter; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java index bc795a45e..d30fee8c1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.Base64Adapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; +import dev.metaschema.core.datatype.adapter.Base64Adapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import java.nio.ByteBuffer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java index 58e74bbc6..4d42954d3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAtomicItemBase; -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.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; +package dev.metaschema.core.metapath.item.atomic.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.AbstractAtomicItemBase; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java index 4b3d4e4ed..692c8af81 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DateTimeWithTZAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; +import dev.metaschema.core.datatype.adapter.DateTimeWithTZAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java index ae8f317b0..7ddb78486 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DateTimeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDateTime; +import dev.metaschema.core.datatype.adapter.DateTimeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.object.AmbiguousDateTime; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java index 9822fd0bf..5c7de9ae5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DateWithTZAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; +import dev.metaschema.core.datatype.adapter.DateWithTZAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java index bc698bc0a..eae6c607b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DateAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDate; +import dev.metaschema.core.datatype.adapter.DateAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.object.AmbiguousDate; import java.time.ZonedDateTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java index dcf721a48..894d33246 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DayTimeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.DayTimeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.time.Duration; import java.time.ZoneOffset; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java index 00aa47bac..c8d1d8f82 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java similarity index 67% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java index 964ffcdfe..9173fcbad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.EmailAddressAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IEmailAddressItem; +import dev.metaschema.core.datatype.adapter.EmailAddressAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IEmailAddressItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java index 434857888..d69d8c22a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.HexBinaryAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHexBinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; +import dev.metaschema.core.datatype.adapter.HexBinaryAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.IHexBinaryItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import java.nio.ByteBuffer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java similarity index 67% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java index 8aa51f65e..c0c3e5341 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.HostnameAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHostnameItem; +import dev.metaschema.core.datatype.adapter.HostnameAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IHostnameItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java index 70ba80966..a5578a9ec 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.AbstractBinaryAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.datatype.adapter.AbstractBinaryAdapter; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import java.nio.ByteBuffer; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java index b76a9dcca..020774568 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.IPv4AddressAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv4AddressItem; +import dev.metaschema.core.datatype.adapter.IPv4AddressAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IIPv4AddressItem; import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv4.IPv4Address; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java index d9b88b79b..8cf640f0b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.IPv6AddressAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv6AddressItem; +import dev.metaschema.core.datatype.adapter.IPv6AddressAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IIPv6AddressItem; import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv6.IPv6Address; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java index cc4abe588..bdebed010 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.IntegerAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java index 1a16695ed..fc205a0cd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupLineItem; +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.metapath.item.atomic.IMarkupLineItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java index 426cb1f3b..1052b3e67 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultilineAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.MarkupMultilineAdapter; +import dev.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java similarity index 70% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java index cc0bee0d4..9da904cf4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.NcNameAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INcNameItem; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.NcNameAdapter; +import dev.metaschema.core.metapath.item.atomic.INcNameItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java index cdb07c15f..28add01cc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java similarity index 69% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java index 95cec453a..d1a8ef5aa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IPositiveIntegerItem; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.metapath.item.atomic.IPositiveIntegerItem; import java.math.BigInteger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java index daeecae82..8d47f20a4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAtomicItemBase; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IQNameItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.AbstractAtomicItemBase; +import dev.metaschema.core.metapath.item.atomic.IQNameItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java index e8bdc1962..4f0710afc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.StringAdapter; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java index feaea64cd..b74273fa4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.TimeWithTZAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.TimeWithTZAdapter; +import dev.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; import java.time.OffsetTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java index 8ebee2ff4..1302cd116 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.TimeAdapter; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousTime; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.TimeAdapter; +import dev.metaschema.core.datatype.object.AmbiguousTime; import java.time.OffsetTime; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java similarity index 67% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java index 98dd86349..bfd5bd269 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITokenItem; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.metapath.item.atomic.ITokenItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java similarity index 68% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java index e50775222..82f45d059 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUriReferenceItem; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.metapath.item.atomic.IUriReferenceItem; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java index 13513be58..674a28973 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; - -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.UuidAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; -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.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.atomic.impl; + +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.UuidAdapter; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.IUuidItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; +import dev.metaschema.core.util.ObjectUtils; import java.util.UUID; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java index 33fcd83bc..41869ec80 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; +package dev.metaschema.core.metapath.item.atomic.impl; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.YearMonthAdapter; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.YearMonthAdapter; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import java.time.Period; import java.util.Objects; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/package-info.java new file mode 100644 index 000000000..0e3a29f99 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/package-info.java @@ -0,0 +1,139 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Concrete implementations of atomic item types for the Metapath type system. + *

    + * This package provides the internal implementation classes for all atomic item + * types defined in {@link dev.metaschema.core.metapath.item.atomic}. Each + * implementation class wraps a native Java value and provides Metapath + * operations, comparisons, and type conversions according to XPath 3.1 + * semantics. + * + *

    Base Implementation Classes

    + *

    + * The package includes abstract base classes that provide common functionality + * for related atomic types: + *

      + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractStringItem} + * - Base for string-based types providing whitespace normalization and string + * operations
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractIntegerItem} + * - Base for integer types providing numeric operations and conversions
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractDecimalItem} + * - Base for decimal numeric types
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractTemporalItem} + * - Base for date/time types
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractDateItem} - + * Base for date values with optional timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractTimeItem} - + * Base for time values with optional timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractDateTimeItem} + * - Base for combined date/time values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractDurationItem} + * - Base for duration types
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractBinaryItem} + * - Base for binary data types (base64 and hex)
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractUriItem} - + * Base for URI-related types
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractMarkupItem} + * - Base for markup content types
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AbstractIPAddressItem} + * - Base for IP address types (v4 and v6)
      • + *
    + * + *

    String and Text Types

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.StringItemImpl} - + * Standard string values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.TokenItemImpl} - + * Normalized whitespace strings
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.NcNameItemImpl} - + * XML NCNames (non-colonized names)
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.MarkupLineItemImpl} + * - Single-line formatted text
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.MarkupMultiLineItemImpl} + * - Multi-line formatted text
      • + *
    + * + *

    Numeric Types

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.IntegerItemImpl} - + * Arbitrary-precision integer values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.NonNegativeIntegerItemImpl} + * - Non-negative integers (zero or positive)
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.PositiveIntegerItemImpl} + * - Strictly positive integers
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.DecimalItemImpl} - + * Decimal numeric values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.BooleanItemImpl} - + * Boolean true/false values
      • + *
    + * + *

    Temporal Types

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.DateTimeWithTimeZoneItemImpl} + * - Date/time values with explicit timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.DateTimeWithoutTimeZoneItemImpl} + * - Date/time values without timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.DateWithTimeZoneItemImpl} + * - Date values with timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.DateWithoutTimeZoneItemImpl} + * - Date values without timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.TimeWithTimeZoneItemImpl} + * - Time values with timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.TimeWithoutTimeZoneItemImpl} + * - Time values without timezone
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.DayTimeDurationItemImpl} + * - Durations measured in days/hours/minutes/seconds
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.YearMonthDurationItemImpl} + * - Durations measured in years/months
      • + *
    + * + *

    URI and Network Types

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.AnyUriItemImpl} - + * Arbitrary URI values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.UriReferenceItemImpl} + * - URI references (absolute or relative)
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.EmailAddressItemImpl} + * - Email address values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.HostnameItemImpl} - + * DNS hostname values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.IPv4AddressItemImpl} + * - IPv4 address values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.IPv6AddressItemImpl} + * - IPv6 address values
      • + *
    + * + *

    Binary and Other Types

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.Base64BinaryItemImpl} + * - Base64-encoded binary data
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.HexBinaryItem} - + * Hex-encoded binary data
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.QNameItemImpl} - + * Qualified names with namespace
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.impl.UuidItemImpl} - + * UUID/GUID values
      • + *
    + *

    + * Each implementation class is paired with a corresponding + * {@link dev.metaschema.core.datatype.IDataTypeAdapter} that handles parsing + * from string representations, validation, and serialization for XML/JSON + * output. + *

    + * This package is considered an implementation detail. Application code should + * use the public interfaces in {@link dev.metaschema.core.metapath.item.atomic} + * and factory methods like {@code IStringItem.valueOf()} rather than directly + * instantiating these implementation classes. + * + * @see dev.metaschema.core.metapath.item.atomic + * @see dev.metaschema.core.datatype + * @see XPath + * 3.1 Data Model: Atomic Values + */ + +package dev.metaschema.core.metapath.item.atomic.impl; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/package-info.java new file mode 100644 index 000000000..71c04441c --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/package-info.java @@ -0,0 +1,60 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Atomic item types representing indivisible values in the Metapath type + * system. + *

    + * This package provides interfaces and implementations for atomic items, which + * are fundamental data values that cannot be decomposed into smaller units. + * Atomic items correspond to simple types in XPath 3.1 and include primitive + * types, numeric types, temporal types, and Metaschema-specific types. + *

    + * Core atomic type interfaces include: + *

      + *
    • {@link dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem} - Base + * interface for all atomic items
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IStringItem} - Text + * values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.INumericItem} - Numeric + * value base interface
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IIntegerItem} - Integer + * values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IDecimalItem} - Decimal + * values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IBooleanItem} - Boolean + * values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IDateTimeItem} - Date and + * time values
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IUriReferenceItem} - URI + * references
      • + *
    + *

    + * Metaschema-specific atomic types include: + *

      + *
    • {@link dev.metaschema.core.metapath.item.atomic.IMarkupItem} - Formatted + * text with inline markup
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IEmailAddressItem} - + * Email addresses
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IHostnameItem} - + * Hostnames
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IIPAddressItem} - IP + * addresses (v4 and v6)
      • + *
    • {@link dev.metaschema.core.metapath.item.atomic.IUuidItem} - UUIDs
      • + *
    + *

    + * Atomic items support type conversions, comparisons, and operations as defined + * by the XPath 3.1 Functions and Operators specification. Each atomic type is + * backed by a corresponding + * {@link dev.metaschema.core.datatype.IDataTypeAdapter} that handles value + * parsing, validation, and serialization. + * + * @see XPath + * 3.1 Data Model: Atomic Values + * @see XPath 3.1 Functions + * and Operators + */ + +package dev.metaschema.core.metapath.item.atomic; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java index d021b784c..b4098121b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; - -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.ArrayItemN; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.function; + +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.impl.AbstractArrayItem; +import dev.metaschema.core.metapath.item.function.impl.ArrayItemN; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ICalendarMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/ICalendarMapKey.java similarity index 65% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ICalendarMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/ICalendarMapKey.java index a45a48ee3..c843c2aca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ICalendarMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/ICalendarMapKey.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ICalendarTemporalItem; +import dev.metaschema.core.metapath.item.atomic.ICalendarTemporalItem; /** * An {@link IMapItem} key based on an {@link ICalendarTemporalItem}. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IDecimalMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IDecimalMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java index 9ef4685f8..4229c06a9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IDecimalMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import java.math.BigDecimal; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IKeySpecifier.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IKeySpecifier.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java index 342579d2c..6434f655c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IKeySpecifier.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java index 00e871c92..12c764d27 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; - -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.MapItemN; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.function; + +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.impl.AbstractMapItem; +import dev.metaschema.core.metapath.item.function.impl.MapItemN; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java index 53529bd00..5b517b4fb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IOpaqueMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IOpaqueMapKey.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IOpaqueMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IOpaqueMapKey.java index bdf234cee..86207a902 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IOpaqueMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IOpaqueMapKey.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; /** * Represents a map key with no special handling based on the key value's data diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IStringMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IStringMapKey.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IStringMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IStringMapKey.java index 75114d190..5717c07ec 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IStringMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IStringMapKey.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ITemporalMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/ITemporalMapKey.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ITemporalMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/ITemporalMapKey.java index a2d4596f8..f88f99c21 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ITemporalMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/ITemporalMapKey.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITemporalItem; +import dev.metaschema.core.metapath.item.atomic.ITemporalItem; /** * An {@link IMapItem} key based on an {@link ITemporalItem} value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java index 45a4ab664..631f9cb2c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.ArrayMetapathException; +import dev.metaschema.core.metapath.item.function.impl.ArrayMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java index 3639a47c8..d1725b2a9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import gov.nist.secauto.metaschema.core.metapath.item.function.impl.ArrayMetapathException; +import dev.metaschema.core.metapath.item.function.impl.ArrayMetapathException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java index fccfdc7d8..4417046f4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; - -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.impl.IFeatureCollectionFunctionItem; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.function.impl; + +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.impl.IFeatureCollectionFunctionItem; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Iterator; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java index 19c073a36..e428711b7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; +package dev.metaschema.core.metapath.item.function.impl; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.function.library.ArrayGet; -import gov.nist.secauto.metaschema.core.metapath.function.library.MapGet; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.function.library.ArrayGet; +import dev.metaschema.core.metapath.function.library.MapGet; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IKeySpecifier; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractMapItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractMapItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java index d4dc1f5ba..07abbb93e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractMapItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; - -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.library.MapGet; -import gov.nist.secauto.metaschema.core.metapath.impl.IFeatureCollectionFunctionItem; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.function.impl; + +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.library.MapGet; +import dev.metaschema.core.metapath.impl.IFeatureCollectionFunctionItem; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Iterator; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractStringMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractStringMapKey.java similarity index 54% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractStringMapKey.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractStringMapKey.java index ee89d8aef..d8b8da64c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/AbstractStringMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractStringMapKey.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; +package dev.metaschema.core.metapath.item.function.impl; -import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.item.function.IStringMapKey; +import dev.metaschema.core.metapath.impl.AbstractMapKey; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.item.function.IStringMapKey; /** * An implementation of a {@link IMapKey} that uses a string-based value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ArrayItemN.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ArrayItemN.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java index 20d266813..96d9fffab 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ArrayItemN.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; +package dev.metaschema.core.metapath.item.function.impl; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java index 02e9e5b57..b9c19da73 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; +package dev.metaschema.core.metapath.item.function.impl; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionMetapathError; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.function.FunctionMetapathError; +import dev.metaschema.core.metapath.item.function.IArrayItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ImmutableCollections.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ImmutableCollections.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java index c9d5b5623..cde8fd6b8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/ImmutableCollections.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; +package dev.metaschema.core.metapath.item.function.impl; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.AbstractCollection; import java.util.AbstractMap; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/MapItemN.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/MapItemN.java rename to core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java index 0b61691c7..8ebc80a4f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/MapItemN.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; +package dev.metaschema.core.metapath.item.function.impl; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Map; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/package-info.java new file mode 100644 index 000000000..5002258a2 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/package-info.java @@ -0,0 +1,66 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides concrete implementations of Metapath function items (arrays and + * maps). + *

    + * This package contains the implementation classes for the function item + * interfaces defined in {@link dev.metaschema.core.metapath.item.function}. + * These classes provide immutable, efficient implementations of arrays and maps + * for use in Metapath expressions. + * + *

    Array Implementations

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.function.impl.AbstractArrayItem} + * - Base class for all array item implementations, providing common utility + * methods
      • + *
    • {@link dev.metaschema.core.metapath.item.function.impl.ArrayItemN} - + * Array implementation that supports an unbounded number of members
      • + *
    + * + *

    Map Implementations

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.function.impl.AbstractMapItem} - + * Base class for all map item implementations, providing common utility methods + * including the function call interface for map lookup
      • + *
    • {@link dev.metaschema.core.metapath.item.function.impl.MapItemN} - Map + * implementation that supports an unbounded number of entries
      • + *
    + * + *

    Map Key Implementations

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey} + * - Base implementation for string-based map keys
      • + *
    • {@link dev.metaschema.core.metapath.item.function.impl.AbstractKeySpecifier} + * - Base implementation for key specifier that computes keys from items
      • + *
    + * + *

    Utility Classes

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.function.impl.ImmutableCollections} + * - Utility classes for creating immutable collection wrappers
      • + *
    + * + *

    Exceptions

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.function.impl.ArrayMetapathException} + * - Base exception for array-related errors
      • + *
    + * + *

    Implementation Notes

    + *

    + * All array and map implementations in this package are immutable. Attempts to + * modify them through the {@link java.util.List} or {@link java.util.Map} + * interfaces will throw {@link UnsupportedOperationException}. + *

    + * Array indices in the public API are 1-based (following XPath 3.1 + * conventions), but are converted to 0-based indices internally when accessing + * the underlying Java collections. + * + * @see dev.metaschema.core.metapath.item.function + */ + +package dev.metaschema.core.metapath.item.function.impl; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/package-info.java new file mode 100644 index 000000000..d3c8f653b --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/package-info.java @@ -0,0 +1,71 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides support for Metapath function items, including arrays and maps. + *

    + * This package implements the XPath 3.1 function item types, including arrays + * and maps. These are first-class values in Metapath that can be passed as + * arguments, returned from functions, and stored in sequences. + * + *

    Array Items

    + *

    + * Arrays are ordered collections of values, where each value is a sequence. + *

      + *
    • {@link dev.metaschema.core.metapath.item.function.IArrayItem} - The main + * interface for array items, implementing {@link java.util.List}
      • + *
    + *

    + * Arrays are immutable once created and support operations like getting members + * by position (1-indexed), determining size, and conversion to sequences. + * Factory methods are provided for creating arrays with various numbers of + * members. + * + *

    Map Items

    + *

    + * Maps are unordered collections of key-value pairs, where keys must be atomic + * items and values are sequences. + *

      + *
    • {@link dev.metaschema.core.metapath.item.function.IMapItem} - The main + * interface for map items, implementing {@link java.util.Map}
      • + *
    • {@link dev.metaschema.core.metapath.item.function.IMapKey} - The key type + * used in maps, wrapping atomic items with proper equality semantics
      • + *
    • {@link dev.metaschema.core.metapath.item.function.IKeySpecifier} - + * Interface for computing map keys from items
      • + *
    + *

    + * Maps are immutable once created and support operations like getting values by + * key, determining size, and merging maps. Factory methods are provided for + * creating maps with various numbers of entries. + * + *

    Map Key Types

    + *

    + * Different atomic types use different equality semantics for map keys: + *

      + *
    • {@link dev.metaschema.core.metapath.item.function.IStringMapKey} - Keys + * for string-based types (string, anyURI)
      • + *
    • {@link dev.metaschema.core.metapath.item.function.IDecimalMapKey} - Keys + * for numeric types (decimal, integer, float, double)
      • + *
    • {@link dev.metaschema.core.metapath.item.function.ITemporalMapKey} - Keys + * for date/time types (date, dateTime, time)
      • + *
    • {@link dev.metaschema.core.metapath.item.function.ICalendarMapKey} - Keys + * for calendar-based types
      • + *
    • {@link dev.metaschema.core.metapath.item.function.IOpaqueMapKey} - Keys + * for types with identity-based equality (boolean, QName, etc.)
      • + *
    + * + *

    Exceptions

    + *
      + *
    • {@link dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException} + * - Thrown when accessing an array with an out-of-bounds index
      • + *
    • {@link dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException} + * - Thrown when attempting to create an array with a negative length
      • + *
    + * + * @see dev.metaschema.core.metapath.item.function.IArrayItem + * @see dev.metaschema.core.metapath.item.function.IMapItem + */ + +package dev.metaschema.core.metapath.item.function; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java index 1f3741f80..a1dc90cba 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.INamedInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java index 73dcc24c9..452a90b19 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java index 22e567842..44a3a86af 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.INamedInstance; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java index 27f995f05..beb249b99 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java index ce1d8b15b..6535bbf8c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java index 95e63f244..8dd41d818 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java @@ -1,21 +1,21 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemVisitor.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemVisitor.java index 90fa69d2e..ffd0239fc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemVisitor.java @@ -1,5 +1,5 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java index fdfebda97..222a1113f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java index 38b8431f5..e23af4b59 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyDefinition; /** * A node item visitor that prevents infinite recursion when traversing assembly diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java index 8afcf0fbd..cd32221f7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java index a9a5a4f63..317554d6f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java index 77cf845ac..272326f2d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java index e73becf5b..490ae1e95 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java index b0d70f48a..ab8992132 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java index e23c44654..2b90cc623 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java index 4130a8cf1..a8578dbd6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java @@ -1,18 +1,18 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; - -import gov.nist.secauto.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.node; + +import dev.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; +import dev.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java index 5300b6ac0..667ab3f0e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java index 0bafaa9aa..15a91bd41 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java index ad627f31e..0116dd64a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java index 63e4026e7..539eebbb3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java index 701c4d9b8..902d33b25 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java index 05276795c..9d21108dc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java index af625c127..94b735587 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java index d3ea0c22f..ac82a407a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAssemblyInstanceGroupedNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyInstanceGroupedNodeItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAssemblyInstanceGroupedNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyInstanceGroupedNodeItem.java index 2c672084f..416fca4a3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAssemblyInstanceGroupedNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyInstanceGroupedNodeItem.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.IPathFormatter; /** * Represents a Metapath assembly node item for a grouped assembly instance. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java similarity index 71% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java index 7e838e54b..1f956f3f2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java @@ -1,16 +1,16 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -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.InvalidTypeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java index f0b0a289e..11e0ab983 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAtomicValuedItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ICycledAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/ICycledAssemblyNodeItem.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ICycledAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/ICycledAssemblyNodeItem.java index b7165d46b..947d7eb8d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ICycledAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/ICycledAssemblyNodeItem.java @@ -1,5 +1,5 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java index b531267c8..a097bcaa4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java index 36c9b5c7d..31d944b4c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java index cf139829a..5297a5d98 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java @@ -1,11 +1,11 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.IKindTest; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java index 89e132dbc..97ba9af11 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAtomicValuedItem; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; +import dev.metaschema.core.model.IValuedDefinition; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java index 9f4cf71ec..1aeb9aabe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticContext; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java index e6ad88a50..77cb831f7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java index 69544a8d2..29f8268f3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java similarity index 58% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java index 50c49335f..8488b2017 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAtomicValuedItem; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java index a127be516..8be7bb400 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java index c8de2b8eb..1568791d1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstance; /** * A mixin interface used to identify that the implementation is a diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionNodeItem.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionNodeItem.java index b71d5da5f..7680e9254 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionNodeItem.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.INamedInstance; /** * A mixin interface used to identify that the implementation is a diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java similarity index 66% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java index 36cd46e8a..37e466fc9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java @@ -1,7 +1,7 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java similarity index 73% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFieldNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java index c3b1fb2c7..8c9b0b199 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java @@ -1,15 +1,15 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java index dfcd8f8a1..bacca6d86 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java @@ -1,16 +1,16 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +package dev.metaschema.core.metapath.item.node; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.qname.IEnhancedQName; import java.net.URI; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java index 9ac3a1363..c6d1deeda 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java index e69b0936a..9bfd9ccb4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java @@ -1,12 +1,12 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.model.IModule; import java.net.URI; @@ -17,9 +17,8 @@ * Metaschema module by effective name. *

    * All definitions in the - * {@link gov.nist.secauto.metaschema.core.model.IDefinition.ModuleScope#PUBLIC} - * are visible. This allows the exported structure of the Metaschema module to - * be queried. + * {@link dev.metaschema.core.model.IDefinition.ModuleScope#PUBLIC} are visible. + * This allows the exported structure of the Metaschema module to be queried. */ public interface IModuleNodeItem extends IDocumentBasedNodeItem, IFeatureNoDataValuedItem { /** diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java index c18dc152a..f669f20c6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java @@ -1,15 +1,15 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; - -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.format.IPathSegment; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.item.node; + +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.IPathSegment; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemFactory.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemFactory.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java index ad88f7f06..5218b4dbb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java @@ -1,15 +1,15 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModule; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java index dd6cfe4bc..08a4aee10 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; +import dev.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; +import dev.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; import java.util.function.Supplier; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemVisitable.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemVisitable.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemVisitable.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemVisitable.java index 9ef0e862b..6e287b1eb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemVisitable.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemVisitable.java @@ -1,5 +1,5 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemVisitor.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemVisitor.java index 0c8f3d097..85918a783 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemVisitor.java @@ -1,5 +1,5 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java index fcb3fd212..ddb8b4f9c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java index 017ee96d9..6110ea5c6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeComparators.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeComparators.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java index 41254aa77..3c692622d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeComparators.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeItemKind.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeItemKind.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeItemKind.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/NodeItemKind.java index 70acdac93..6cc64c6c4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeItemKind.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeItemKind.java @@ -1,5 +1,5 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; /** * This enumeration provides a listing of the available kinds of diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java index db18e6746..ec8eca20c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java index cb7686584..6eef8f0e3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.util.ObjectUtils; import java.util.stream.Collectors; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/package-info.java new file mode 100644 index 000000000..802463cfc --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/package-info.java @@ -0,0 +1,53 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Node item types representing structured data in the Metapath type system. + *

    + * This package provides interfaces and implementations for node items, which + * form tree-structured graphs representing both Metaschema models (module + * definitions) and data instances conforming to those models. Node items enable + * navigation and querying of hierarchical data using Metapath expressions. + *

    + * Core node type interfaces include: + *

      + *
    • {@link dev.metaschema.core.metapath.item.node.INodeItem} - Base interface + * for all node items
      • + *
    • {@link dev.metaschema.core.metapath.item.node.IDocumentNodeItem} - + * Document root node representing a data instance
      • + *
    • {@link dev.metaschema.core.metapath.item.node.IAssemblyNodeItem} - + * Assembly nodes containing nested structures
      • + *
    • {@link dev.metaschema.core.metapath.item.node.IFieldNodeItem} - Field + * nodes containing values and flags
      • + *
    • {@link dev.metaschema.core.metapath.item.node.IFlagNodeItem} - Flag nodes + * containing simple values
      • + *
    • {@link dev.metaschema.core.metapath.item.node.IModuleNodeItem} - Module + * definition nodes representing Metaschema schemas
      • + *
    + *

    + * Node items support: + *

      + *
    • XPath-style navigation (parent, child, ancestor, descendant + * relationships)
      • + *
    • Document order traversal for predictable query results
      • + *
    • Access to typed values through + * {@link dev.metaschema.core.metapath.item.node.IAtomicValuedNodeItem}
      • + *
    • Visitor pattern traversal via + * {@link dev.metaschema.core.metapath.item.node.INodeItemVisitor}
      • + *
    • Factory-based creation through + * {@link dev.metaschema.core.metapath.item.node.INodeItemFactory}
      • + *
    + *

    + * Node items integrate with Metaschema model definitions in + * {@link dev.metaschema.core.model}, providing runtime representations that can + * be queried using Metapath expressions. Each node maintains references to its + * definition (schema-level metadata) and its position within the document tree. + * + * @see XPath 3.1 Data + * Model: Nodes + * @see dev.metaschema.core.model + */ + +package dev.metaschema.core.metapath.item.node; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/item/package-info.java new file mode 100644 index 000000000..c8fc42fa1 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/item/package-info.java @@ -0,0 +1,35 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Core interfaces and classes for the Metapath item type system. + *

    + * This package provides the foundational abstractions for representing values + * in Metapath expressions, aligning with the XPath 3.1 Data Model. All Metapath + * values are either items or sequences of items. + *

    + * Key interfaces include: + *

      + *
    • {@link dev.metaschema.core.metapath.item.IItem} - Base interface for all + * Metapath items (atomic values, nodes, functions, arrays, and maps)
      • + *
    • {@link dev.metaschema.core.metapath.item.ISequence} - Ordered collection + * of items representing expression evaluation results
      • + *
    • {@link dev.metaschema.core.metapath.item.ICollectionValue} - Common + * interface for values that can be stored in arrays or maps
      • + *
    • {@link dev.metaschema.core.metapath.item.IItemVisitor} - Visitor pattern + * interface for traversing item hierarchies
      • + *
    + *

    + * The type system integrates with Metaschema data types defined in + * {@link dev.metaschema.core.datatype} while extending them to support the full + * XPath 3.1 type hierarchy including atomic items, node items, and function + * items. + * + * @see XPath 3.1 Specification + * @see XPath 3.1 Data + * Model + */ + +package dev.metaschema.core.metapath.item; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/package-info.java similarity index 64% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/package-info.java rename to core/src/main/java/dev/metaschema/core/metapath/package-info.java index 4288c1b05..1cd55b799 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/package-info.java +++ b/core/src/main/java/dev/metaschema/core/metapath/package-info.java @@ -13,17 +13,17 @@ *

    * Key interfaces and classes: *

      - *
    • {@link gov.nist.secauto.metaschema.core.metapath.IMetapathExpression} - - * Main interface for compiled Metapath expressions with methods for compilation - * and evaluation
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.StaticContext} - XPath - * 3.1 static context containing namespace bindings, function resolver, and - * other compile-time information
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.DynamicContext} - XPath - * 3.1 dynamic context containing runtime state such as focus items, variables, - * and current date/time
      • - *
    • {@link gov.nist.secauto.metaschema.core.metapath.MetapathException} - - * Base exception type for all Metapath evaluation errors
      • + *
    • {@link dev.metaschema.core.metapath.IMetapathExpression} - Main interface + * for compiled Metapath expressions with methods for compilation and + * evaluation
      • + *
    • {@link dev.metaschema.core.metapath.StaticContext} - XPath 3.1 static + * context containing namespace bindings, function resolver, and other + * compile-time information
      • + *
    • {@link dev.metaschema.core.metapath.DynamicContext} - XPath 3.1 dynamic + * context containing runtime state such as focus items, variables, and current + * date/time
      • + *
    • {@link dev.metaschema.core.metapath.MetapathException} - Base exception + * type for all Metapath evaluation errors
      • *
    *

    * Typical usage pattern: @@ -52,4 +52,4 @@ * @see XPath 3.1 Specification */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java b/core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java index 0a92b4ed8..a78417665 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.impl.AbstractItemType; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.impl.AbstractItemType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/DataTypeItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/DataTypeItemType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java index 922c229c2..927f54907 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/DataTypeItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IArrayTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IArrayTest.java rename to core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java index 1c56ed527..30774a66c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IArrayTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IAtomicOrUnionType.java b/core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IAtomicOrUnionType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java index f3217b34b..98de3e309 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IAtomicOrUnionType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.impl.NonAdapterAtomicItemType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.impl.NonAdapterAtomicItemType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IItemType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java index 1d2e33d92..409285363 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -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.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.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.impl.AnyFunctionItemType; -import gov.nist.secauto.metaschema.core.metapath.type.impl.AnyItemType; -import gov.nist.secauto.metaschema.core.metapath.type.impl.AnyKindTest; -import gov.nist.secauto.metaschema.core.metapath.type.impl.ArrayTestImpl; -import gov.nist.secauto.metaschema.core.metapath.type.impl.KindAssemblyTestImpl; -import gov.nist.secauto.metaschema.core.metapath.type.impl.KindDocumentTestImpl; -import gov.nist.secauto.metaschema.core.metapath.type.impl.KindFieldTestImpl; -import gov.nist.secauto.metaschema.core.metapath.type.impl.KindFlagTestImpl; -import gov.nist.secauto.metaschema.core.metapath.type.impl.MapTestImpl; -import gov.nist.secauto.metaschema.core.metapath.type.impl.TypeConstants; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.IItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.impl.AnyFunctionItemType; +import dev.metaschema.core.metapath.type.impl.AnyItemType; +import dev.metaschema.core.metapath.type.impl.AnyKindTest; +import dev.metaschema.core.metapath.type.impl.ArrayTestImpl; +import dev.metaschema.core.metapath.type.impl.KindAssemblyTestImpl; +import dev.metaschema.core.metapath.type.impl.KindDocumentTestImpl; +import dev.metaschema.core.metapath.type.impl.KindFieldTestImpl; +import dev.metaschema.core.metapath.type.impl.KindFlagTestImpl; +import dev.metaschema.core.metapath.type.impl.MapTestImpl; +import dev.metaschema.core.metapath.type.impl.TypeConstants; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IKindTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/IKindTest.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IKindTest.java rename to core/src/main/java/dev/metaschema/core/metapath/type/IKindTest.java index ac7304875..7a1c5642f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IKindTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IKindTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; /** * Provides type information that be used to discover type information for, diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IMapTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java similarity index 86% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IMapTest.java rename to core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java index acb57b340..b3c2c8937 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IMapTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/ISequenceType.java b/core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/ISequenceType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java index 13248c390..e58165ea8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/ISequenceType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.type.impl.SequenceTypeImpl; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.impl.SequenceTypeImpl; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/InvalidTypeMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/InvalidTypeMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java index b5b88c711..4de088a86 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/InvalidTypeMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/Occurrence.java b/core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/Occurrence.java rename to core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java index a62481feb..37c5946e4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/Occurrence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/TypeMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/TypeMetapathException.java rename to core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java index 59fc5331a..017cd2b70 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/TypeMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type; +package dev.metaschema.core.metapath.type; -import gov.nist.secauto.metaschema.core.metapath.IErrorCode; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.IErrorCode; +import dev.metaschema.core.metapath.MetapathException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java index bcad8e444..6fab78b34 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; - -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.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.type.impl; + +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AbstractItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AbstractItemType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java index 87266cf50..e1540bb11 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AbstractItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.type.IItemType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyFunctionItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyFunctionItemType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java index 911cf9157..89e258ec3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyFunctionItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.type.IItemType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyItemType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java index 4ae9c4c68..721b39e0b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.type.IItemType; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyKindTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyKindTest.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java index e9c3d0cf9..3babee81e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/AnyKindTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -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.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.IKindTest; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/ArrayTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java similarity index 72% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/ArrayTestImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java index a019b71fe..6177f5af6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/ArrayTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.type.IArrayTest; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.type.IArrayTest; +import dev.metaschema.core.metapath.type.ISequenceType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/DynamicTypeSupport.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/DynamicTypeSupport.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java index 6cfa1789b..5b6d60e5e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/DynamicTypeSupport.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -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.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java index e2b3e3451..2a789d1d4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java index b8430a21c..7aa587656 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -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.metapath.type.IKindTest; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.IItem; +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.metapath.type.IKindTest; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindFieldTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindFieldTestImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java index d53ce488c..487005db6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindFieldTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindFlagTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindFlagTestImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java index 35308d260..ff48cd553 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/KindFlagTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/MapTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/MapTestImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java index 1216e727f..f17aabe4f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/MapTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.metapath.type.IMapTest; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IMapTest; +import dev.metaschema.core.metapath.type.ISequenceType; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java index d15f7f8da..f967cd732 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/SequenceTypeImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/SequenceTypeImpl.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java index 8caea15f3..99b280534 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/SequenceTypeImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; - -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.type.IItemType; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.metapath.type.impl; + +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.util.ObjectUtils; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/TypeConstants.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/TypeConstants.java rename to core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java index 7c61133f6..69a9d8ab6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/TypeConstants.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.type.impl; +package dev.metaschema.core.metapath.type.impl; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPAddressItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIPAddressItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.EQNameFactory; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/package-info.java new file mode 100644 index 000000000..b8b88d1b7 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/package-info.java @@ -0,0 +1,69 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides concrete implementations of the Metapath type system interfaces. + *

    + * This package contains the implementation classes for the Metapath type system + * defined in {@link dev.metaschema.core.metapath.type}. These classes provide + * the runtime type checking, validation, and testing mechanisms used throughout + * the Metapath implementation. + * + *

    Item Type Implementations

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.impl.AnyItemType} - A type that + * matches any item (item())
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.AnyFunctionItemType} - A + * type that matches any function item
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.AbstractItemType} - Base + * class for custom item type implementations
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.NonAdapterAtomicItemType} - + * Item type for atomic types that are not backed by data type adapters
      • + *
    + * + *

    Node Kind Tests

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.impl.AnyKindTest} - Singleton + * tests for matching any node, document, assembly, field, or flag
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.AbstractDefinitionTest} - + * Base class for tests that match nodes by name and/or definition type
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.KindDocumentTestImpl} - + * Tests for matching document nodes with optional root element type + * constraints
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.KindAssemblyTestImpl} - + * Tests for matching assembly nodes by name and/or type
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.KindFieldTestImpl} - Tests + * for matching field nodes by name and/or type
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.KindFlagTestImpl} - Tests + * for matching flag nodes by name and/or type
      • + *
    + * + *

    Collection Type Tests

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.impl.ArrayTestImpl} - Tests for + * matching array items with optional member type constraints
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.MapTestImpl} - Tests for + * matching map items with key and value type constraints
      • + *
    + * + *

    Sequence Types

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.impl.SequenceTypeImpl} - + * Implementation of sequence type testing with occurrence validation
      • + *
    + * + *

    Type Constants

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.impl.TypeConstants} - Provides + * singleton instances for abstract atomic types (any-atomic-type, duration, + * ip-address, numeric)
      • + *
    • {@link dev.metaschema.core.metapath.type.impl.DynamicTypeSupport} - + * Utility methods for dynamic type operations
      • + *
    + * + * @see dev.metaschema.core.metapath.type + */ + +package dev.metaschema.core.metapath.type.impl; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/package-info.java b/core/src/main/java/dev/metaschema/core/metapath/type/package-info.java new file mode 100644 index 000000000..f89f5423a --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/metapath/type/package-info.java @@ -0,0 +1,61 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides support for Metapath type system and sequence type testing. + *

    + * This package implements the Metapath type system, which is based on the XPath + * 3.1 type system. It provides mechanisms for type testing, type matching, and + * type validation of Metapath items and sequences. + *

    + * The core interfaces define type information that can be used to: + *

      + *
    • Test if an item or sequence matches a specific type
      • + *
    • Validate sequences against expected types and cardinality
      • + *
    • Perform type casting and conversion operations
      • + *
    • Generate type signatures for error messages and debugging
      • + *
    + * + *

    Key Interfaces

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.IItemType} - The base type + * interface for all item types, providing factory methods for creating tests + * for atomic types, node kinds, functions, arrays, and maps
      • + *
    • {@link dev.metaschema.core.metapath.type.ISequenceType} - Represents a + * sequence type with cardinality constraints (occurrence indicators)
      • + *
    • {@link dev.metaschema.core.metapath.type.IKindTest} - A specialized item + * type for testing node items by their kind (document, assembly, field, + * flag)
      • + *
    • {@link dev.metaschema.core.metapath.type.IAtomicOrUnionType} - Represents + * atomic types and union types that can be used for type testing and value + * conversion
      • + *
    • {@link dev.metaschema.core.metapath.type.IArrayTest} - Specialized item + * type for testing array items with member type constraints
      • + *
    • {@link dev.metaschema.core.metapath.type.IMapTest} - Specialized item + * type for testing map items with key and value type constraints
      • + *
    + * + *

    Supporting Classes

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.Occurrence} - Enum representing + * sequence cardinality indicators (zero, one, zero-or-one, one-or-more, + * zero-or-more)
      • + *
    • {@link dev.metaschema.core.metapath.type.DataTypeItemType} - Item type + * implementation for Metaschema data types backed by adapters
      • + *
    + * + *

    Exceptions

    + *
      + *
    • {@link dev.metaschema.core.metapath.type.TypeMetapathException} - Base + * exception for type-related errors
      • + *
    • {@link dev.metaschema.core.metapath.type.InvalidTypeMetapathException} - + * Thrown when a value does not match the expected type
      • + *
    + * + * @see dev.metaschema.core.metapath.type.IItemType + * @see dev.metaschema.core.metapath.type.ISequenceType + */ + +package dev.metaschema.core.metapath.type; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractAssemblyInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractAssemblyInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java index 20d5a9dde..82a30fed5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractAssemblyInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceGroupInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractChoiceGroupInstance.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceGroupInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractChoiceGroupInstance.java index ef3c1ef92..a50561197 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceGroupInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractChoiceGroupInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractChoiceInstance.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractChoiceInstance.java index a0cd04d95..20e77bd4d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractChoiceInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractContainerModelSupport.java b/core/src/main/java/dev/metaschema/core/model/AbstractContainerModelSupport.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractContainerModelSupport.java rename to core/src/main/java/dev/metaschema/core/model/AbstractContainerModelSupport.java index 660c3ef13..8ef112434 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractContainerModelSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractContainerModelSupport.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFieldInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFieldInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java index f18f32803..e43def7e2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFieldInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFlagInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFlagInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java index c61d6549d..8906ba186 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFlagInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalAssemblyDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalAssemblyDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java index 0fc81203a..db1eb6536 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalAssemblyDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.model.util.ModuleUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java index 601055a02..7272fce9c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFieldDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFieldDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java index edace6b03..4089a2f3c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFieldDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.model.util.ModuleUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFlagDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFlagDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java index 0f6ada3f0..39c2fef08 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFlagDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.model.util.ModuleUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java index 125147fdd..83bf80f01 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java index 6e846c851..c6cf7d265 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFlagDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFlagDefinition.java rename to core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java index 66042c3db..480f23e99 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFlagDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractInstance.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractInstance.java index 05aca51bb..ebed6651b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java b/core/src/main/java/dev/metaschema/core/model/AbstractLoader.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java rename to core/src/main/java/dev/metaschema/core/model/AbstractLoader.java index e3388cc1a..3f790b200 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractLoader.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import com.github.benmanes.caffeine.cache.Caffeine; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModelElementVisitor.java b/core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModelElementVisitor.java rename to core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java index d4b59f2a4..28c265e47 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModelElementVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.metapath.item.node.AbstractNodeItemVisitor; +import dev.metaschema.core.metapath.item.node.AbstractNodeItemVisitor; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java b/core/src/main/java/dev/metaschema/core/model/AbstractModule.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java rename to core/src/main/java/dev/metaschema/core/model/AbstractModule.java index 1b027c359..f662204b6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractModule.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java b/core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java rename to core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java index 6c7a5cda3..1a077dde0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.io.IOException; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java index 4b4a9a59b..71048678e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.AbstractGlobalDefinition.NameInitializer; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.AbstractGlobalDefinition.NameInitializer; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstance.java rename to core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java index 44cc84fb9..038aaa103 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractResourceResolver.java b/core/src/main/java/dev/metaschema/core/model/AbstractResourceResolver.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractResourceResolver.java rename to core/src/main/java/dev/metaschema/core/model/AbstractResourceResolver.java index 07cac5b3a..7129464d4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractResourceResolver.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractResourceResolver.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultAssemblyModelBuilder.java b/core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultAssemblyModelBuilder.java rename to core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java index c0f07188b..ca192792f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultAssemblyModelBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultChoiceGroupModelBuilder.java b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultChoiceGroupModelBuilder.java rename to core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java index a50073eef..c3d31b131 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultChoiceGroupModelBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerModelChoiceGroupSupport; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.impl.DefaultContainerModelChoiceGroupSupport; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultChoiceModelBuilder.java b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultChoiceModelBuilder.java rename to core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java index 6495fedb8..c6cf0cb87 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefaultChoiceModelBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerModelSupport; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.impl.DefaultContainerModelSupport; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefinitionCollectingModelWalker.java b/core/src/main/java/dev/metaschema/core/model/DefinitionCollectingModelWalker.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/DefinitionCollectingModelWalker.java rename to core/src/main/java/dev/metaschema/core/model/DefinitionCollectingModelWalker.java index dee5db862..f291c3f5d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/DefinitionCollectingModelWalker.java +++ b/core/src/main/java/dev/metaschema/core/model/DefinitionCollectingModelWalker.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/FlagContainerBuilder.java b/core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/FlagContainerBuilder.java rename to core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java index 42d458183..9920e66a3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/FlagContainerBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerFlagSupport; -import gov.nist.secauto.metaschema.core.qname.EQNameFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.impl.DefaultContainerFlagSupport; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java b/core/src/main/java/dev/metaschema/core/model/IAssembly.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java rename to core/src/main/java/dev/metaschema/core/model/IAssembly.java index fd920aaa5..6ae2c02c4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java +++ b/core/src/main/java/dev/metaschema/core/model/IAssembly.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java b/core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java rename to core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java index 4ad1c7d2b..1d9778675 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.MetaschemaConstants; -import gov.nist.secauto.metaschema.core.model.constraint.IFeatureModelConstrained; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.model.constraint.IFeatureModelConstrained; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java b/core/src/main/java/dev/metaschema/core/model/IAssemblyInstance.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java rename to core/src/main/java/dev/metaschema/core/model/IAssemblyInstance.java index 339075e9e..4b5a88391 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IAssemblyInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents an assembly instance within another assembly definition. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstanceAbsolute.java b/core/src/main/java/dev/metaschema/core/model/IAssemblyInstanceAbsolute.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstanceAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/IAssemblyInstanceAbsolute.java index e738a7190..18566e14c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstanceAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/IAssemblyInstanceAbsolute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstanceGrouped.java b/core/src/main/java/dev/metaschema/core/model/IAssemblyInstanceGrouped.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstanceGrouped.java rename to core/src/main/java/dev/metaschema/core/model/IAssemblyInstanceGrouped.java index 119820093..6497f9808 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstanceGrouped.java +++ b/core/src/main/java/dev/metaschema/core/model/IAssemblyInstanceGrouped.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAttributable.java b/core/src/main/java/dev/metaschema/core/model/IAttributable.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IAttributable.java rename to core/src/main/java/dev/metaschema/core/model/IAttributable.java index f9184b049..77a9c0d5f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAttributable.java +++ b/core/src/main/java/dev/metaschema/core/model/IAttributable.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.MetaschemaConstants; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.util.CollectionUtil; import java.util.Map; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IBoundObject.java b/core/src/main/java/dev/metaschema/core/model/IBoundObject.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IBoundObject.java rename to core/src/main/java/dev/metaschema/core/model/IBoundObject.java index f1849fcd9..b91f6b1fd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IBoundObject.java +++ b/core/src/main/java/dev/metaschema/core/model/IBoundObject.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java b/core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java rename to core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java index d688eda5e..ca89f5cb7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.util.ObjectUtils; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceInstance.java b/core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceInstance.java rename to core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java index 5c6b353b1..9ab6084c0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IConstraintLoader.java b/core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IConstraintLoader.java rename to core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java index 518489847..3d34814a2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IConstraintLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.IConstraintSet; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainer.java b/core/src/main/java/dev/metaschema/core/model/IContainer.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainer.java rename to core/src/main/java/dev/metaschema/core/model/IContainer.java index 1674a31ed..b6af7da2c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainer.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents a model element that can contain child instances. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java b/core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java rename to core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java index c758e2218..2da579cd0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.EmptyFlagContainer; +import dev.metaschema.core.model.impl.EmptyFlagContainer; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java b/core/src/main/java/dev/metaschema/core/model/IContainerModel.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java rename to core/src/main/java/dev/metaschema/core/model/IContainerModel.java index a4e56253e..e936da52d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModel.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelAbsolute.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/IContainerModelAbsolute.java index 305adfe8c..f00ee41d1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelAbsolute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAssembly.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelAssembly.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAssembly.java rename to core/src/main/java/dev/metaschema/core/model/IContainerModelAssembly.java index d5013455d..a4c584b5d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAssembly.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelAssembly.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAssemblySupport.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAssemblySupport.java rename to core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java index bb3df78f1..b98ff297b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAssemblySupport.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; +import dev.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelGrouped.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java rename to core/src/main/java/dev/metaschema/core/model/IContainerModelGrouped.java index 38a48fd62..3857433f3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelGrouped.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java rename to core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java index 4f6158c0c..d2ac7a1d3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerModelSupport; +import dev.metaschema.core.model.impl.DefaultContainerModelSupport; import java.util.Collection; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefaultable.java b/core/src/main/java/dev/metaschema/core/model/IDefaultable.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefaultable.java rename to core/src/main/java/dev/metaschema/core/model/IDefaultable.java index 865f1c0c3..6ebe8cd57 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefaultable.java +++ b/core/src/main/java/dev/metaschema/core/model/IDefaultable.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java b/core/src/main/java/dev/metaschema/core/model/IDefinition.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java rename to core/src/main/java/dev/metaschema/core/model/IDefinition.java index bbb4cc62d..fbff05f9c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IDefinition.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.constraint.IFeatureValueConstrained; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.constraint.IFeatureValueConstrained; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java b/core/src/main/java/dev/metaschema/core/model/IDescribable.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java rename to core/src/main/java/dev/metaschema/core/model/IDescribable.java index e3991712d..3b9667e32 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java +++ b/core/src/main/java/dev/metaschema/core/model/IDescribable.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLine; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java index d463c3ef1..f4252c9f7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelAbsolute.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelAbsolute.java index bc7778809..b9bbbd5ab 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelAbsolute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAssembly.java b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelAssembly.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAssembly.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelAssembly.java index c678799e0..f1553bad7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAssembly.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelAssembly.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelGrouped.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelGrouped.java index cf57e8e13..0b3b53572 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerModelGrouped.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java index 391924b93..f0429b091 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java index 1239612c7..679a914fb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLine; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureValueless.java b/core/src/main/java/dev/metaschema/core/model/IFeatureValueless.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureValueless.java rename to core/src/main/java/dev/metaschema/core/model/IFeatureValueless.java index 7d1310696..3518ad47a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureValueless.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureValueless.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents an instance that has no value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java b/core/src/main/java/dev/metaschema/core/model/IField.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java rename to core/src/main/java/dev/metaschema/core/model/IField.java index 1a9ef48f2..33623fc2a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java +++ b/core/src/main/java/dev/metaschema/core/model/IField.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * A marker interface for an information element that is a field model type. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldDefinition.java b/core/src/main/java/dev/metaschema/core/model/IFieldDefinition.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldDefinition.java rename to core/src/main/java/dev/metaschema/core/model/IFieldDefinition.java index 544e8de01..71a48dd60 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IFieldDefinition.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java b/core/src/main/java/dev/metaschema/core/model/IFieldInstance.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java rename to core/src/main/java/dev/metaschema/core/model/IFieldInstance.java index 1d14ce0d9..7b84170cb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IFieldInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents a field instance within an assembly definition. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstanceAbsolute.java b/core/src/main/java/dev/metaschema/core/model/IFieldInstanceAbsolute.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstanceAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/IFieldInstanceAbsolute.java index 2ca88b1a3..44181e0a4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstanceAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/IFieldInstanceAbsolute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstanceGrouped.java b/core/src/main/java/dev/metaschema/core/model/IFieldInstanceGrouped.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstanceGrouped.java rename to core/src/main/java/dev/metaschema/core/model/IFieldInstanceGrouped.java index a15589d7a..e8cc44d39 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstanceGrouped.java +++ b/core/src/main/java/dev/metaschema/core/model/IFieldInstanceGrouped.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java b/core/src/main/java/dev/metaschema/core/model/IFlag.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java rename to core/src/main/java/dev/metaschema/core/model/IFlag.java index 63929cb1f..dab1ce1b8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java +++ b/core/src/main/java/dev/metaschema/core/model/IFlag.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * A marker interface for an information element that is an flag model type. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagContainerBuilder.java b/core/src/main/java/dev/metaschema/core/model/IFlagContainerBuilder.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagContainerBuilder.java rename to core/src/main/java/dev/metaschema/core/model/IFlagContainerBuilder.java index 3b8cdc06c..d9c6f45a7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagContainerBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/IFlagContainerBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java b/core/src/main/java/dev/metaschema/core/model/IFlagDefinition.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java rename to core/src/main/java/dev/metaschema/core/model/IFlagDefinition.java index dfc4122b8..7072e0d36 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IFlagDefinition.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java b/core/src/main/java/dev/metaschema/core/model/IFlagInstance.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java rename to core/src/main/java/dev/metaschema/core/model/IFlagInstance.java index 695b49ec9..9f856569a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IFlagInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java b/core/src/main/java/dev/metaschema/core/model/IGroupable.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java rename to core/src/main/java/dev/metaschema/core/model/IGroupable.java index 198ff6783..195fa0d89 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java +++ b/core/src/main/java/dev/metaschema/core/model/IGroupable.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IInstance.java b/core/src/main/java/dev/metaschema/core/model/IInstance.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IInstance.java rename to core/src/main/java/dev/metaschema/core/model/IInstance.java index 32073f6e9..0c8c4afaa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IInstanceAbsolute.java b/core/src/main/java/dev/metaschema/core/model/IInstanceAbsolute.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IInstanceAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/IInstanceAbsolute.java index f073738da..579a8c9f4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IInstanceAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/IInstanceAbsolute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents an instance with an absolute path and an associated value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonInstance.java b/core/src/main/java/dev/metaschema/core/model/IJsonInstance.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonInstance.java rename to core/src/main/java/dev/metaschema/core/model/IJsonInstance.java index 218263d5f..3ed0b1741 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IJsonInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonNamed.java b/core/src/main/java/dev/metaschema/core/model/IJsonNamed.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonNamed.java rename to core/src/main/java/dev/metaschema/core/model/IJsonNamed.java index 69cb950ca..71c0d4f65 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonNamed.java +++ b/core/src/main/java/dev/metaschema/core/model/IJsonNamed.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ILoader.java b/core/src/main/java/dev/metaschema/core/model/ILoader.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/ILoader.java rename to core/src/main/java/dev/metaschema/core/model/ILoader.java index 84c45b018..04409bb7a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ILoader.java +++ b/core/src/main/java/dev/metaschema/core/model/ILoader.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetapathQueryable.java b/core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetapathQueryable.java rename to core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java index 05c71294b..155b827f9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetapathQueryable.java +++ b/core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaData.java b/core/src/main/java/dev/metaschema/core/model/IMetaschemaData.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaData.java rename to core/src/main/java/dev/metaschema/core/model/IMetaschemaData.java index 7e68bafcf..4669dd685 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaData.java +++ b/core/src/main/java/dev/metaschema/core/model/IMetaschemaData.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents data associated with a Metaschema module. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaModule.java b/core/src/main/java/dev/metaschema/core/model/IMetaschemaModule.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaModule.java rename to core/src/main/java/dev/metaschema/core/model/IMetaschemaModule.java index 3208ef206..d3017a5a6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaModule.java +++ b/core/src/main/java/dev/metaschema/core/model/IMetaschemaModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents a loaded Metaschema module. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java b/core/src/main/java/dev/metaschema/core/model/IModelDefinition.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java rename to core/src/main/java/dev/metaschema/core/model/IModelDefinition.java index 6c18aad2c..b199ace1e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelDefinition.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; import java.util.function.Predicate; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java b/core/src/main/java/dev/metaschema/core/model/IModelElement.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java rename to core/src/main/java/dev/metaschema/core/model/IModelElement.java index 1c15ae92c..8abc4fec1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelElement.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.MarkupMultiline; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElementVisitable.java b/core/src/main/java/dev/metaschema/core/model/IModelElementVisitable.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElementVisitable.java rename to core/src/main/java/dev/metaschema/core/model/IModelElementVisitable.java index 860b084b1..18cbffb5f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElementVisitable.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelElementVisitable.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElementVisitor.java b/core/src/main/java/dev/metaschema/core/model/IModelElementVisitor.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElementVisitor.java rename to core/src/main/java/dev/metaschema/core/model/IModelElementVisitor.java index 5a859ec66..4a8ae7176 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElementVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelElementVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java b/core/src/main/java/dev/metaschema/core/model/IModelInstance.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java rename to core/src/main/java/dev/metaschema/core/model/IModelInstance.java index 173267b16..581904ce6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * This marker interface is used to identify a field or assembly instance that diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java b/core/src/main/java/dev/metaschema/core/model/IModelInstanceAbsolute.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/IModelInstanceAbsolute.java index 0acee8b0b..97d8c61cb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelInstanceAbsolute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents a model instance with an absolute path and an associated value. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java b/core/src/main/java/dev/metaschema/core/model/IModule.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java rename to core/src/main/java/dev/metaschema/core/model/IModule.java index 5287229d1..8ce34fa20 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java +++ b/core/src/main/java/dev/metaschema/core/model/IModule.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.qname.IEnhancedQName; import java.net.URI; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java b/core/src/main/java/dev/metaschema/core/model/IModuleExtended.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java rename to core/src/main/java/dev/metaschema/core/model/IModuleExtended.java index 1158a4c5d..818f4089f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java +++ b/core/src/main/java/dev/metaschema/core/model/IModuleExtended.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleLoader.java b/core/src/main/java/dev/metaschema/core/model/IModuleLoader.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleLoader.java rename to core/src/main/java/dev/metaschema/core/model/IModuleLoader.java index 8d1fef2ee..c903930b2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/IModuleLoader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java b/core/src/main/java/dev/metaschema/core/model/INamed.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java rename to core/src/main/java/dev/metaschema/core/model/INamed.java index b75209329..5c2097bd6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java +++ b/core/src/main/java/dev/metaschema/core/model/INamed.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.IEnhancedQName; import javax.xml.XMLConstants; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java b/core/src/main/java/dev/metaschema/core/model/INamedInstance.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java rename to core/src/main/java/dev/metaschema/core/model/INamedInstance.java index a985ee8ac..05b80c6b0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedInstance.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelElement.java b/core/src/main/java/dev/metaschema/core/model/INamedModelElement.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelElement.java rename to core/src/main/java/dev/metaschema/core/model/INamedModelElement.java index 8c1f5128b..bda4b3ad2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelElement.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedModelElement.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java b/core/src/main/java/dev/metaschema/core/model/INamedModelInstance.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java rename to core/src/main/java/dev/metaschema/core/model/INamedModelInstance.java index 877788c66..3aa77dfa5 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedModelInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.function.Predicate; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java rename to core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java index 3015f6d1e..a5f24798f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java rename to core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java index e48569029..7e08752a9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceLocation.java b/core/src/main/java/dev/metaschema/core/model/IResourceLocation.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceLocation.java rename to core/src/main/java/dev/metaschema/core/model/IResourceLocation.java index b1e24b5d9..272c581c6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceLocation.java +++ b/core/src/main/java/dev/metaschema/core/model/IResourceLocation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Represents a location within a resource. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceResolver.java b/core/src/main/java/dev/metaschema/core/model/IResourceResolver.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceResolver.java rename to core/src/main/java/dev/metaschema/core/model/IResourceResolver.java index 63e7155e4..26429f3ca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceResolver.java +++ b/core/src/main/java/dev/metaschema/core/model/IResourceResolver.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ISource.java b/core/src/main/java/dev/metaschema/core/model/ISource.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/ISource.java rename to core/src/main/java/dev/metaschema/core/model/ISource.java index 8efee288c..a7700c23e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ISource.java +++ b/core/src/main/java/dev/metaschema/core/model/ISource.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.constraint.impl.InternalModelSource; -import gov.nist.secauto.metaschema.core.model.constraint.impl.StaticContextSource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.constraint.impl.InternalModelSource; +import dev.metaschema.core.model.constraint.impl.StaticContextSource; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; @@ -35,8 +35,8 @@ enum SourceLocation { /** * Get the descriptor for a - * {@link gov.nist.secauto.metaschema.core.model.ISource.SourceLocation#MODEL} - * source with as associated resource. + * {@link dev.metaschema.core.model.ISource.SourceLocation#MODEL} source with as + * associated resource. * * @param module * the Metaschema module the constraint was defined in @@ -50,8 +50,8 @@ static ISource moduleSource(@NonNull IModule module) { /** * Get the descriptor for a - * {@link gov.nist.secauto.metaschema.core.model.ISource.SourceLocation#EXTERNAL} - * source for the provided resource. + * {@link dev.metaschema.core.model.ISource.SourceLocation#EXTERNAL} source for + * the provided resource. * * @param location * the resource used as the source @@ -65,8 +65,8 @@ static ISource externalSource(@NonNull String location) { /** * Get the descriptor for a - * {@link gov.nist.secauto.metaschema.core.model.ISource.SourceLocation#EXTERNAL} - * source for the provided resource. + * {@link dev.metaschema.core.model.ISource.SourceLocation#EXTERNAL} source for + * the provided resource. * * @param location * the resource used as the source @@ -84,8 +84,8 @@ static ISource externalSource(@NonNull URI location) { /** * Get the descriptor for a - * {@link gov.nist.secauto.metaschema.core.model.ISource.SourceLocation#EXTERNAL} - * source with as associated resource. + * {@link dev.metaschema.core.model.ISource.SourceLocation#EXTERNAL} source with + * as associated resource. *

    * The provided static context idenfies the location of this source based on the * {@link StaticContext#getBaseUri()} method. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IUriResolver.java b/core/src/main/java/dev/metaschema/core/model/IUriResolver.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IUriResolver.java rename to core/src/main/java/dev/metaschema/core/model/IUriResolver.java index 083752855..ad4ea0fbc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IUriResolver.java +++ b/core/src/main/java/dev/metaschema/core/model/IUriResolver.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java b/core/src/main/java/dev/metaschema/core/model/IValued.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java rename to core/src/main/java/dev/metaschema/core/model/IValued.java index 59cbdeec6..0e5ccb913 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java +++ b/core/src/main/java/dev/metaschema/core/model/IValued.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValuedDefinition.java b/core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IValuedDefinition.java rename to core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java index 583abf1bc..ca9700a48 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValuedDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValuedInstance.java b/core/src/main/java/dev/metaschema/core/model/IValuedInstance.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IValuedInstance.java rename to core/src/main/java/dev/metaschema/core/model/IValuedInstance.java index 91185f270..5d10739af 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValuedInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IValuedInstance.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java b/core/src/main/java/dev/metaschema/core/model/JsonGroupAsBehavior.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java rename to core/src/main/java/dev/metaschema/core/model/JsonGroupAsBehavior.java index 908179ef3..0b9e2a577 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java +++ b/core/src/main/java/dev/metaschema/core/model/JsonGroupAsBehavior.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Defines how repeated instances are grouped in JSON/YAML representations. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonValueKeyTypeEnum.java b/core/src/main/java/dev/metaschema/core/model/JsonValueKeyTypeEnum.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonValueKeyTypeEnum.java rename to core/src/main/java/dev/metaschema/core/model/JsonValueKeyTypeEnum.java index 3013426f2..3c878af7a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonValueKeyTypeEnum.java +++ b/core/src/main/java/dev/metaschema/core/model/JsonValueKeyTypeEnum.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Defines the type of JSON value key used to identify data values. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java b/core/src/main/java/dev/metaschema/core/model/MetaschemaException.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java rename to core/src/main/java/dev/metaschema/core/model/MetaschemaException.java index 5c8173222..133169145 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java +++ b/core/src/main/java/dev/metaschema/core/model/MetaschemaException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Indicates an error related to Metaschema processing. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaModelConstants.java b/core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaModelConstants.java rename to core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java index fa325e4b7..334bc924c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaModelConstants.java +++ b/core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; - -import gov.nist.secauto.metaschema.core.MetaschemaConstants; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IReportConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +package dev.metaschema.core.model; + +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IReportConstraint; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelInitializationException.java b/core/src/main/java/dev/metaschema/core/model/ModelInitializationException.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelInitializationException.java rename to core/src/main/java/dev/metaschema/core/model/ModelInitializationException.java index 1fd9838ef..921f51837 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelInitializationException.java +++ b/core/src/main/java/dev/metaschema/core/model/ModelInitializationException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Identifies that an unexpected error occurred while initializing or using a diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelType.java b/core/src/main/java/dev/metaschema/core/model/ModelType.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelType.java rename to core/src/main/java/dev/metaschema/core/model/ModelType.java index 8ae4b70e5..07bd74ccf 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelType.java +++ b/core/src/main/java/dev/metaschema/core/model/ModelType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelWalker.java b/core/src/main/java/dev/metaschema/core/model/ModelWalker.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelWalker.java rename to core/src/main/java/dev/metaschema/core/model/ModelWalker.java index f04b185ff..b4e4c037a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/ModelWalker.java +++ b/core/src/main/java/dev/metaschema/core/model/ModelWalker.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/SimpleResourceLocation.java b/core/src/main/java/dev/metaschema/core/model/SimpleResourceLocation.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/SimpleResourceLocation.java rename to core/src/main/java/dev/metaschema/core/model/SimpleResourceLocation.java index d201f860e..036ca3d43 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/SimpleResourceLocation.java +++ b/core/src/main/java/dev/metaschema/core/model/SimpleResourceLocation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; import com.fasterxml.jackson.core.JsonLocation; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/UsedDefinitionModelWalker.java b/core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/UsedDefinitionModelWalker.java rename to core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java index 92564b730..38ecd35ca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/UsedDefinitionModelWalker.java +++ b/core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.util.Collection; import java.util.HashSet; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java b/core/src/main/java/dev/metaschema/core/model/XmlGroupAsBehavior.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java rename to core/src/main/java/dev/metaschema/core/model/XmlGroupAsBehavior.java index 0a3535c31..27adff3ef 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java +++ b/core/src/main/java/dev/metaschema/core/model/XmlGroupAsBehavior.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model; +package dev.metaschema.core.model; /** * Defines how repeated instances are grouped in XML representations. diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConfigurableMessageConstraintBuilder.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConfigurableMessageConstraintBuilder.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConfigurableMessageConstraintBuilder.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AbstractConfigurableMessageConstraintBuilder.java index 452bceace..d880105fd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConfigurableMessageConstraintBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConfigurableMessageConstraintBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java index e0d94cbd0..b8c1382dd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintSet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java index 972e41812..a650480f4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.ISource; +import dev.metaschema.core.model.ISource; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java index 198854f92..22b74b1dc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java index 79fdc961b..410348a32 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java index f0326cdd6..9ab3c9e58 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Locale; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyConstraintSet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java index 9c36fd0bb..242e18f0b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java index 44a050a98..fe3aa3a4f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; import java.util.List; import java.util.function.Supplier; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintInitializationException.java b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintInitializationException.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintInitializationException.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ConstraintInitializationException.java index 819897fe6..36e47a553 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintInitializationException.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintInitializationException.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.ModelInitializationException; +import dev.metaschema.core.model.ModelInitializationException; /** * Identifies that an unexpected error occurred while initializing or using diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationException.java b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationException.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationException.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationException.java index d7b99b1fc..727fe39f7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationException.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java similarity index 93% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java index ea3d4f981..bbb6996fe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; - -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.constraint; + +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Comparator; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java rename to core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java index 7e26e1924..33ecf8b39 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java @@ -3,33 +3,33 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; - -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.AbstractNodeItemVisitor; -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.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ExceptionUtils; -import gov.nist.secauto.metaschema.core.util.ExceptionUtils.WrappedException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.constraint; + +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.AbstractNodeItemVisitor; +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.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ExceptionUtils; +import dev.metaschema.core.util.ExceptionUtils.WrappedException; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultScopedContraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultScopedContraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java index 3e8f0e292..63dafa2eb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultScopedContraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModule; import java.net.URI; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java b/core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java index affd7d60e..962f9c323 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -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.IModuleLoader; -import gov.nist.secauto.metaschema.core.model.constraint.impl.ConstraintComposingVisitor; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +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.IModuleLoader; +import dev.metaschema.core.model.constraint.impl.ConstraintComposingVisitor; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java index 951f94261..23c58fc16 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; import java.util.List; import java.util.function.Supplier; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java rename to core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java index eb5ceada4..2e1ee33a7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding.Kind; -import gov.nist.secauto.metaschema.core.model.validation.IValidationResult; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.IValidationFinding.Kind; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java index 8b8867842..53fbfb993 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; import java.util.List; import java.util.function.Supplier; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValue.java b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValue.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java index f81e57418..22afba629 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValue.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultAllowedValue; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.constraint.impl.DefaultAllowedValue; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java index a819fa461..5a83b32b3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.constraint.impl.DefaultAllowedValuesConstraint; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java index bb267ccfc..06ece6e60 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultCardinalityConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.constraint.impl.DefaultCardinalityConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConfigurableMessageConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConfigurableMessageConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java index fbb8863cd..d7024b6ad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConfigurableMessageConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java index 2367ac1ae..3d6e591d4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IDescribable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.constraint; + +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IDescribable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java index 2cab6812f..ecb5293f0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.ISource; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.ISource; import java.util.Collection; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java similarity index 97% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java index 65641c5f4..b20b95bbc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; import java.util.List; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidator.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidator.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java index 54fedf938..35b276016 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.node.INodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintVisitor.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintVisitor.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintVisitor.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IConstraintVisitor.java index 52dc113b9..edf496662 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintVisitor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java index db770ef77..63ffa0afb 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultExpectConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.constraint.impl.DefaultExpectConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureModelConstrained.java b/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureModelConstrained.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureModelConstrained.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IFeatureModelConstrained.java index 0ed3442ca..7970d10da 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureModelConstrained.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureModelConstrained.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java b/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java index 742e5398b..45586c071 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java b/core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java index 56ab93236..a10750155 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultIndex; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.constraint; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.impl.DefaultIndex; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java index eab9fedcc..acf28bd5d 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultIndexConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.constraint.impl.DefaultIndexConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java index 980f4e26d..971710753 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.constraint.impl.DefaultIndexHasKeyConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IKeyConstraint.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IKeyConstraint.java index fcc5328b0..c681a9d6e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IKeyConstraint.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java b/core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java index df773e31a..09f93eaca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultKeyField; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.constraint.impl.DefaultKeyField; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java b/core/src/main/java/dev/metaschema/core/model/constraint/ILet.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ILet.java index ab608dee2..f4e43ee04 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ILet.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultLet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.impl.DefaultLet; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java index 142a7f3d2..21753ce81 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultMatchesConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.constraint.impl.DefaultMatchesConstraint; +import dev.metaschema.core.util.ObjectUtils; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IModelConstrained.java b/core/src/main/java/dev/metaschema/core/model/constraint/IModelConstrained.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IModelConstrained.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IModelConstrained.java index c95cd439e..bc9145a03 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IModelConstrained.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IModelConstrained.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IReportConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IReportConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java index c5a661142..37b411c2b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IReportConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultReportConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.constraint.impl.DefaultReportConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/IScopedContraints.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IScopedContraints.java index 56b466d36..e2a06debc 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IScopedContraints.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import java.net.URI; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java index d6e2ef417..09a72d9b6 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java index ef1b12e8b..fbe33f90f 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultUniqueConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.constraint.impl.DefaultUniqueConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java b/core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java rename to core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java index 1c8d7e48d..384de4988 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java rename to core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java index 038e565d1..f58135bca 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/MetaConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java similarity index 90% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/MetaConstraintSet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java index 2fa4c63f2..d2fa7bd21 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/MetaConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.constraint; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ModelTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ModelTargetedConstraints.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java index 8f4ae243c..5a7a9319b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ModelTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.ISource; import java.util.List; import java.util.function.Supplier; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfig.java b/core/src/main/java/dev/metaschema/core/model/constraint/ParallelValidationConfig.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfig.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ParallelValidationConfig.java index ce42444e8..4b4f4ddf7 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfig.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ParallelValidationConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import org.eclipse.jdt.annotation.Owning; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ScopedConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ScopedConstraintSet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java index 2370f001e..b1ccc2d63 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ScopedConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; - -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.constraint; + +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValidationFeature.java b/core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValidationFeature.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java index 6fd44ce3a..565d36d85 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValidationFeature.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature; +import dev.metaschema.core.configuration.AbstractConfigurationFeature; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java index b1d936b97..3065a9a41 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java index b2f6d5053..bad07bebe 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidMetapathGrammarException; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationException; -import gov.nist.secauto.metaschema.core.model.constraint.IConfigurableMessageConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.StringUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.IConfigurableMessageConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.StringUtils; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java index 108a9b113..6dc2c6a90 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Map; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java similarity index 77% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java index daa6e1550..de00e881c 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java similarity index 75% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java index 8f7ae79b9..cfe05b899 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; - -import gov.nist.secauto.metaschema.core.model.AbstractModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelElement; -import gov.nist.secauto.metaschema.core.model.INamedModelElement; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.ITargetedConstraints; +package dev.metaschema.core.model.constraint.impl; + +import dev.metaschema.core.model.AbstractModelElementVisitor; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.INamedModelElement; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.ITargetedConstraints; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValue.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValue.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java index f5de750fa..8d17a3cd0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValue.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java index f84944154..9261877b1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java similarity index 82% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java index 478db95c6..7c3c8c303 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IConstraint; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java index 744bdd46f..2a295bd9a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IExpectConstraint; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndex.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndex.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java index 6df6f4d67..48f544c93 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndex.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.IIndex; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.IIndex; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.util.CollectionUtil; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java index 7a8e6ee74..20f780448 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IKeyField; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java index 1303764b7..d17af84f1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java similarity index 74% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java index 4a6480247..0c957c50b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.IUniqueConstraint; import java.util.regex.Pattern; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java index 22b743f39..2c2f5e0e9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java index 0f581c8e5..08a03122a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintInitializationException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ConstraintInitializationException; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IMatchesConstraint; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultReportConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java similarity index 83% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultReportConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java index 610ceb435..93717d714 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultReportConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IReportConstraint; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IReportConstraint; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java index 1bd9f3f23..05d064cf8 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.IUniqueConstraint; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java similarity index 81% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java index b7efbf5af..e6773f7dd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.HashMap; @@ -19,8 +19,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; /** - * Implements a - * {@link gov.nist.secauto.metaschema.core.model.ISource.SourceLocation#MODEL} + * Implements a {@link dev.metaschema.core.model.ISource.SourceLocation#MODEL} * source with no associated resource. */ public final class InternalModelSource implements ISource { diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/StaticContextSource.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/StaticContextSource.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java index 601aa438b..6b6ca3c77 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/StaticContextSource.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.HashMap; @@ -19,8 +19,8 @@ /** * Implements a - * {@link gov.nist.secauto.metaschema.core.model.ISource.SourceLocation#EXTERNAL} - * source with an associated resource. + * {@link dev.metaschema.core.model.ISource.SourceLocation#EXTERNAL} source with + * an associated resource. */ public final class StaticContextSource implements ISource { @NonNull diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/package-info.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/package-info.java similarity index 50% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/package-info.java rename to core/src/main/java/dev/metaschema/core/model/constraint/impl/package-info.java index 8abbe21cd..5c5d9805e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/package-info.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/package-info.java @@ -7,28 +7,27 @@ * Default implementations of Metaschema constraint types. *

    * This package contains the concrete implementations of the constraint - * interfaces defined in the parent - * {@link gov.nist.secauto.metaschema.core.model.constraint} package. These - * implementations provide the runtime behavior for constraint evaluation and - * validation. + * interfaces defined in the parent {@link dev.metaschema.core.model.constraint} + * package. These implementations provide the runtime behavior for constraint + * evaluation and validation. *

    Key Classes

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultAllowedValuesConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultAllowedValuesConstraint} * - Implementation of allowed values restrictions
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultCardinalityConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultCardinalityConstraint} * - Implementation of cardinality enforcement
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultExpectConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultExpectConstraint} * - Implementation of expectation validation
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultMatchesConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultMatchesConstraint} * - Implementation of pattern matching
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultUniqueConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultUniqueConstraint} * - Implementation of uniqueness checking
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultIndexConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultIndexConstraint} * - Implementation of index creation
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultIndexHasKeyConstraint} + *
    • {@link dev.metaschema.core.model.constraint.impl.DefaultIndexHasKeyConstraint} * - Implementation of referential integrity checking
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.constraint.impl.AbstractConstraint} - * - Base class providing common constraint functionality
      • + *
    • {@link dev.metaschema.core.model.constraint.impl.AbstractConstraint} - + * Base class providing common constraint functionality
      • *
    *

    Usage Context

    *

    @@ -44,4 +43,4 @@ * implementation classes. */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/package-info.java b/core/src/main/java/dev/metaschema/core/model/constraint/package-info.java new file mode 100644 index 000000000..a81ec48e5 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/model/constraint/package-info.java @@ -0,0 +1,51 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Metaschema constraint definitions and validation framework. + *

    + * This package provides the constraint system for Metaschema, which allows + * defining and enforcing validation rules on model instances. Constraints can + * restrict allowed values, enforce cardinality, ensure uniqueness, validate + * patterns, and establish referential integrity through index relationships. + *

    Constraint Types

    + *
      + *
    • {@link dev.metaschema.core.model.constraint.IAllowedValuesConstraint} - + * Restricts values to a defined set
      • + *
    • {@link dev.metaschema.core.model.constraint.ICardinalityConstraint} - + * Enforces occurrence requirements (min/max)
      • + *
    • {@link dev.metaschema.core.model.constraint.IExpectConstraint} - + * Validates that a condition is true
      • + *
    • {@link dev.metaschema.core.model.constraint.IMatchesConstraint} - + * Validates values against regex patterns
      • + *
    • {@link dev.metaschema.core.model.constraint.IUniqueConstraint} - Ensures + * uniqueness of key field combinations
      • + *
    • {@link dev.metaschema.core.model.constraint.IIndexConstraint} - Creates + * an index over items for referential integrity
      • + *
    • {@link dev.metaschema.core.model.constraint.IIndexHasKeyConstraint} - + * Verifies that references exist in an index
      • + *
    + *

    Validation

    + *

    + * The {@link dev.metaschema.core.model.constraint.DefaultConstraintValidator} + * provides the main entry point for validating model instances against their + * constraints. Validation results are reported through + * {@link dev.metaschema.core.model.constraint.IConstraintValidationHandler} + * implementations. + *

    Usage Context

    + *

    + * Constraints can be: + *

      + *
    • Defined inline within Metaschema definitions
      • + *
    • Applied externally through constraint sets
      • + *
    • Evaluated during content validation and data binding
      • + *
    • Used to generate validation rules for JSON Schema and XML Schema
      • + *
    + * + * @see dev.metaschema.core.model.constraint.IConstraint + * @see dev.metaschema.core.model.constraint.IConstraintValidator + */ + +package dev.metaschema.core.model.constraint; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerFlagSupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java similarity index 88% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerFlagSupport.java rename to core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java index f07776119..fde9fae68 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerFlagSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.impl; +package dev.metaschema.core.model.impl; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFlagInstance; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java rename to core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java index 73971a59a..a355e832b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.impl; +package dev.metaschema.core.model.impl; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java similarity index 80% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java rename to core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java index 9ec08a85a..95d4468d0 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.impl; +package dev.metaschema.core.model.impl; -import gov.nist.secauto.metaschema.core.model.AbstractContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.AbstractContainerModelSupport; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelSupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java similarity index 84% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelSupport.java rename to core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java index 963a5271e..08772dc53 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerModelSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.impl; +package dev.metaschema.core.model.impl; -import gov.nist.secauto.metaschema.core.model.AbstractContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.AbstractContainerModelSupport; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedHashMap; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/EmptyFlagContainer.java b/core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/EmptyFlagContainer.java rename to core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java index 40fa4c9d2..a07b9cf41 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/EmptyFlagContainer.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.impl; +package dev.metaschema.core.model.impl; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.CollectionUtil; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/package-info.java b/core/src/main/java/dev/metaschema/core/model/impl/package-info.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/package-info.java rename to core/src/main/java/dev/metaschema/core/model/impl/package-info.java index 94763af59..2d3d59047 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/package-info.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/package-info.java @@ -44,13 +44,13 @@ *
      *
    • Metaschema module loaders when constructing definition objects
      • *
    • Definition implementations in the parent - * {@link gov.nist.secauto.metaschema.core.model} package
      • + * {@link dev.metaschema.core.model} package *
    • Databinding implementations that need to navigate model structures
      • *
    * - * @see gov.nist.secauto.metaschema.core.model.IContainerFlagSupport - * @see gov.nist.secauto.metaschema.core.model.IContainerModelSupport - * @see gov.nist.secauto.metaschema.core.model.AbstractContainerModelSupport + * @see dev.metaschema.core.model.IContainerFlagSupport + * @see dev.metaschema.core.model.IContainerModelSupport + * @see dev.metaschema.core.model.AbstractContainerModelSupport */ -package gov.nist.secauto.metaschema.core.model.impl; +package dev.metaschema.core.model.impl; diff --git a/core/src/main/java/dev/metaschema/core/model/package-info.java b/core/src/main/java/dev/metaschema/core/model/package-info.java new file mode 100644 index 000000000..65577e9a2 --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/model/package-info.java @@ -0,0 +1,44 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Core Metaschema model interfaces and implementations. + *

    + * This package defines the fundamental object model for Metaschema modules, + * including definitions (assemblies, fields, flags), instances, and their + * relationships. It provides both the API contracts and abstract base + * implementations for representing Metaschema structures. + *

    Key Interfaces

    + *
      + *
    • {@link dev.metaschema.core.model.IModule} - Represents a Metaschema + * module containing definitions
      • + *
    • {@link dev.metaschema.core.model.IAssemblyDefinition} - Defines a complex + * assembly structure
      • + *
    • {@link dev.metaschema.core.model.IFieldDefinition} - Defines a field with + * optional value and flags
      • + *
    • {@link dev.metaschema.core.model.IFlagDefinition} - Defines a flag + * (simple name-value pair)
      • + *
    • {@link dev.metaschema.core.model.IModelInstance} - Represents an instance + * of a definition within a model
      • + *
    • {@link dev.metaschema.core.model.IContainerModel} - Represents a + * container that can hold model instances
      • + *
    + *

    Usage Context

    + *

    + * This package is used by: + *

      + *
    • Metaschema module loaders to construct in-memory representations of + * modules
      • + *
    • Databinding implementations to map between Java objects and Metaschema + * structures
      • + *
    • Code generators to produce Java classes from Metaschema definitions
      • + *
    • Validation and constraint processing to enforce structural rules
      • + *
    + * + * @see dev.metaschema.core.model.constraint + * @see dev.metaschema.core.model.validation + */ + +package dev.metaschema.core.model; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/DefaultDiagramNode.java b/core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/DefaultDiagramNode.java rename to core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java index b95f04ef2..b974512be 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/DefaultDiagramNode.java +++ b/core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.util; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/IDiagramNode.java b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/IDiagramNode.java rename to core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java index c6c57df3f..4cc227414 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/IDiagramNode.java +++ b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; +package dev.metaschema.core.model.util; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IGroupable; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelInstance; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelInstance; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/IDiagramNodeVisitor.java b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java similarity index 76% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/IDiagramNodeVisitor.java rename to core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java index 50895003b..6b1385c3e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/IDiagramNodeVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; +package dev.metaschema.core.model.util; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceGrouped; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java b/core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java rename to core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java index fcd2a0ae4..49c99e031 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java +++ b/core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; +package dev.metaschema.core.model.util; import com.fasterxml.jackson.core.JsonLocation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/MermaidErDiagramGenerator.java b/core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/MermaidErDiagramGenerator.java rename to core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java index ba195df47..86d839dec 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/MermaidErDiagramGenerator.java +++ b/core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; - -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.ModelWalker; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.core.model.util; + +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.ModelWalker; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.jdt.annotation.NotOwning; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/ModuleUtils.java b/core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java similarity index 79% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/ModuleUtils.java rename to core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java index 0dac57955..fb461afc1 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/ModuleUtils.java +++ b/core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; +package dev.metaschema.core.model.util; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ModelInitializationException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ModelInitializationException; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java b/core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java rename to core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java index 6f25fec37..00698aaff 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java +++ b/core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; +package dev.metaschema.core.model.util; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLStreamReader2; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlUtil.java b/core/src/main/java/dev/metaschema/core/model/util/XmlUtil.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlUtil.java rename to core/src/main/java/dev/metaschema/core/model/util/XmlUtil.java index d48b12861..2006c9faa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlUtil.java +++ b/core/src/main/java/dev/metaschema/core/model/util/XmlUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.util; +package dev.metaschema.core.model.util; import java.io.IOException; import java.net.URL; diff --git a/core/src/main/java/dev/metaschema/core/model/util/package-info.java b/core/src/main/java/dev/metaschema/core/model/util/package-info.java new file mode 100644 index 000000000..82d9d4faf --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/model/util/package-info.java @@ -0,0 +1,36 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Utility classes for Metaschema model processing and manipulation. + *

    + * This package provides helper classes and utilities for working with + * Metaschema models, including JSON/XML parsing utilities, diagram generation, + * and module manipulation tools. + *

    Key Classes

    + *
      + *
    • {@link dev.metaschema.core.model.util.JsonUtil} - JSON parsing and + * utility methods
      • + *
    • {@link dev.metaschema.core.model.util.XmlUtil} - XML processing and + * utility methods
      • + *
    • {@link dev.metaschema.core.model.util.XmlEventUtil} - StAX XML event + * stream utilities
      • + *
    • {@link dev.metaschema.core.model.util.ModuleUtils} - Module traversal and + * manipulation utilities
      • + *
    • {@link dev.metaschema.core.model.util.MermaidErDiagramGenerator} - + * Generates Mermaid ER diagrams from Metaschema modules
      • + *
    + *

    Usage Context

    + *

    + * These utilities support: + *

      + *
    • Content serialization and deserialization
      • + *
    • Model visualization and documentation
      • + *
    • Module analysis and traversal
      • + *
    • Low-level parsing operations
      • + *
    + */ + +package dev.metaschema.core.model.util; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AbstractContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java similarity index 78% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AbstractContentValidator.java rename to core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java index 6326491d9..cc9171828 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AbstractContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.AbstractResourceResolver; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.AbstractResourceResolver; +import dev.metaschema.core.util.ObjectUtils; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AbstractValidationResultProcessor.java b/core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java similarity index 85% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AbstractValidationResultProcessor.java rename to core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java index a005c2052..61ee36c2e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AbstractValidationResultProcessor.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java b/core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java similarity index 89% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java rename to core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java index 1fb93b60c..4f550140b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IContentValidator.java rename to core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java index e3a2420ba..4245521f3 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.util.ObjectUtils; import org.json.JSONObject; import org.xml.sax.SAXException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java b/core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java similarity index 92% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java rename to core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java index c96a822b7..b8ebd79cd 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint; import java.net.URI; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationResult.java b/core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationResult.java rename to core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java index d2aa23a19..cba275c47 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationResult.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java rename to core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java index 5d7d2e319..c7154c295 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; import org.everit.json.schema.Schema; import org.everit.json.schema.ValidationException; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java rename to core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java index 711d581aa..54f96dc7a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import org.eclipse.jdt.annotation.Owning; import org.xml.sax.ErrorHandler; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/package-info.java b/core/src/main/java/dev/metaschema/core/model/validation/package-info.java similarity index 50% rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/package-info.java rename to core/src/main/java/dev/metaschema/core/model/validation/package-info.java index 6776fcfb3..66a08c2aa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/package-info.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/package-info.java @@ -12,22 +12,21 @@ * Metaschema module. *

    Key Interfaces and Classes

    *
      - *
    • {@link gov.nist.secauto.metaschema.core.model.validation.IContentValidator} - * - Common interface for content validators
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator} - * - Validates XML content against XML Schema (XSD)
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator} - * - Validates JSON content against JSON Schema
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.validation.IValidationResult} - * - Represents the outcome of a validation operation
      • - *
    • {@link gov.nist.secauto.metaschema.core.model.validation.IValidationFinding} - * - Represents an individual validation issue or error
      • + *
    • {@link dev.metaschema.core.model.validation.IContentValidator} - Common + * interface for content validators
      • + *
    • {@link dev.metaschema.core.model.validation.XmlSchemaContentValidator} - + * Validates XML content against XML Schema (XSD)
      • + *
    • {@link dev.metaschema.core.model.validation.JsonSchemaContentValidator} - + * Validates JSON content against JSON Schema
      • + *
    • {@link dev.metaschema.core.model.validation.IValidationResult} - + * Represents the outcome of a validation operation
      • + *
    • {@link dev.metaschema.core.model.validation.IValidationFinding} - + * Represents an individual validation issue or error
      • *
    *

    Usage Context

    *

    * This validation framework differs from constraint validation - * ({@link gov.nist.secauto.metaschema.core.model.constraint.IConstraint}) in - * that it: + * ({@link dev.metaschema.core.model.constraint.IConstraint}) in that it: *

      *
    • Validates against schema documents (XSD/JSON Schema) rather than * constraint rules
      • @@ -40,10 +39,9 @@ *

      * For constraint-based validation (e.g., allowed values, uniqueness, * cardinality), use the - * {@link gov.nist.secauto.metaschema.core.model.constraint.IConstraint} - * instead. + * {@link dev.metaschema.core.model.constraint.IConstraint} instead. * - * @see gov.nist.secauto.metaschema.core.model.constraint.IConstraint + * @see dev.metaschema.core.model.constraint.IConstraint */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/package-info.java b/core/src/main/java/dev/metaschema/core/package-info.java similarity index 87% rename from core/src/main/java/gov/nist/secauto/metaschema/core/package-info.java rename to core/src/main/java/dev/metaschema/core/package-info.java index 434bdd127..ba5580c10 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/package-info.java +++ b/core/src/main/java/dev/metaschema/core/package-info.java @@ -28,11 +28,11 @@ *

      * Key class in this package: *

        - *
      • {@link gov.nist.secauto.metaschema.core.MetaschemaConstants} - Metaschema - * namespace and related constants
        • + *
      • {@link dev.metaschema.core.MetaschemaConstants} - Metaschema namespace + * and related constants
        • *
      * * @see Metaschema Project */ -package gov.nist.secauto.metaschema.core; +package dev.metaschema.core; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/EQNameFactory.java b/core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/qname/EQNameFactory.java rename to core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java index fc3b69a2c..73bdcbf13 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/EQNameFactory.java +++ b/core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.Optional; import java.util.regex.Matcher; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/IEnhancedQName.java b/core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/qname/IEnhancedQName.java rename to core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java index 7ad4906b8..c076e1a62 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/IEnhancedQName.java +++ b/core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Optional; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/NamespaceCache.java b/core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java similarity index 96% rename from core/src/main/java/gov/nist/secauto/metaschema/core/qname/NamespaceCache.java rename to core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java index 4f90b2603..44bf3f92b 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/NamespaceCache.java +++ b/core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Map; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/QNameCache.java b/core/src/main/java/dev/metaschema/core/qname/QNameCache.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/qname/QNameCache.java rename to core/src/main/java/dev/metaschema/core/qname/QNameCache.java index 7e8e3bf33..4bcd15054 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/QNameCache.java +++ b/core/src/main/java/dev/metaschema/core/qname/QNameCache.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Comparator; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/WellKnown.java b/core/src/main/java/dev/metaschema/core/qname/WellKnown.java similarity index 94% rename from core/src/main/java/gov/nist/secauto/metaschema/core/qname/WellKnown.java rename to core/src/main/java/dev/metaschema/core/qname/WellKnown.java index 6058173a4..63d5849fa 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/WellKnown.java +++ b/core/src/main/java/dev/metaschema/core/qname/WellKnown.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Map; import java.util.Map.Entry; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/package-info.java b/core/src/main/java/dev/metaschema/core/qname/package-info.java similarity index 91% rename from core/src/main/java/gov/nist/secauto/metaschema/core/qname/package-info.java rename to core/src/main/java/dev/metaschema/core/qname/package-info.java index 1882c6254..3324ab03e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/qname/package-info.java +++ b/core/src/main/java/dev/metaschema/core/qname/package-info.java @@ -71,10 +71,10 @@ *

      * This package is used throughout the Metaschema framework: *

        - *
      • {@link gov.nist.secauto.metaschema.core.metapath} - For XPath/Metapath - * QName literals and namespace resolution
        • - *
      • {@link gov.nist.secauto.metaschema.core.model} - For storing element and - * attribute qualified names in model definitions
        • + *
      • {@link dev.metaschema.core.metapath} - For XPath/Metapath QName literals + * and namespace resolution
        • + *
      • {@link dev.metaschema.core.model} - For storing element and attribute + * qualified names in model definitions
        • *
      • The databind module - For mapping between Java classes and XML/JSON * element names
        • *
      • XML/JSON serialization components throughout the framework
        • @@ -95,7 +95,7 @@ * {@link QNameCache} for details). * * @see javax.xml.namespace.QName - * @see gov.nist.secauto.metaschema.core.metapath.StaticContext + * @see dev.metaschema.core.metapath.StaticContext */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/AutoCloser.java b/core/src/main/java/dev/metaschema/core/util/AutoCloser.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/AutoCloser.java rename to core/src/main/java/dev/metaschema/core/util/AutoCloser.java index 76849d556..f5d2cd85e 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/AutoCloser.java +++ b/core/src/main/java/dev/metaschema/core/util/AutoCloser.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import org.eclipse.jdt.annotation.Owning; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java b/core/src/main/java/dev/metaschema/core/util/CollectionUtil.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java rename to core/src/main/java/dev/metaschema/core/util/CollectionUtil.java index 997008cfc..8d2be9890 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java +++ b/core/src/main/java/dev/metaschema/core/util/CollectionUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java b/core/src/main/java/dev/metaschema/core/util/CustomCollectors.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java rename to core/src/main/java/dev/metaschema/core/util/CustomCollectors.java index 15b0c6896..20cf1989a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java +++ b/core/src/main/java/dev/metaschema/core/util/CustomCollectors.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/DeleteOnShutdown.java b/core/src/main/java/dev/metaschema/core/util/DeleteOnShutdown.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/DeleteOnShutdown.java rename to core/src/main/java/dev/metaschema/core/util/DeleteOnShutdown.java index 3092189c9..20bbe0ef4 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/DeleteOnShutdown.java +++ b/core/src/main/java/dev/metaschema/core/util/DeleteOnShutdown.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/ExceptionUtils.java b/core/src/main/java/dev/metaschema/core/util/ExceptionUtils.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/ExceptionUtils.java rename to core/src/main/java/dev/metaschema/core/util/ExceptionUtils.java index 5c5f6fe66..097adc6b2 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/ExceptionUtils.java +++ b/core/src/main/java/dev/metaschema/core/util/ExceptionUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import java.util.Arrays; import java.util.Objects; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java b/core/src/main/java/dev/metaschema/core/util/IVersionInfo.java similarity index 95% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java rename to core/src/main/java/dev/metaschema/core/util/IVersionInfo.java index 8f3a2c340..4e37a96ad 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java +++ b/core/src/main/java/dev/metaschema/core/util/IVersionInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java b/core/src/main/java/dev/metaschema/core/util/ObjectUtils.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java rename to core/src/main/java/dev/metaschema/core/util/ObjectUtils.java index ae89c70b5..3907f272a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java +++ b/core/src/main/java/dev/metaschema/core/util/ObjectUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import java.util.Objects; import java.util.stream.Stream; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/StringUtils.java b/core/src/main/java/dev/metaschema/core/util/StringUtils.java similarity index 98% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/StringUtils.java rename to core/src/main/java/dev/metaschema/core/util/StringUtils.java index fda8038d1..66c0d38b9 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/StringUtils.java +++ b/core/src/main/java/dev/metaschema/core/util/StringUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import java.util.function.Function; import java.util.regex.Matcher; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java b/core/src/main/java/dev/metaschema/core/util/UriUtils.java similarity index 99% rename from core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java rename to core/src/main/java/dev/metaschema/core/util/UriUtils.java index 89a7629a6..d2d4dc62a 100644 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java +++ b/core/src/main/java/dev/metaschema/core/util/UriUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import java.net.URI; import java.net.URISyntaxException; diff --git a/core/src/main/java/dev/metaschema/core/util/package-info.java b/core/src/main/java/dev/metaschema/core/util/package-info.java new file mode 100644 index 000000000..2680a38dd --- /dev/null +++ b/core/src/main/java/dev/metaschema/core/util/package-info.java @@ -0,0 +1,40 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides utility classes for common operations throughout the Metaschema + * framework. + *

        + * This package contains helper classes for working with collections, objects, + * strings, URIs, and other common Java types. These utilities provide null-safe + * operations, type conversions, and enhanced functionality beyond standard Java + * libraries. + *

        + * Key utility classes: + *

          + *
        • {@link dev.metaschema.core.util.ObjectUtils} - Null-safety assertions and + * object validation ({@code notNull}, {@code requireNonNull})
          • + *
        • {@link dev.metaschema.core.util.CollectionUtil} - Collection operations + * including unmodifiable wrappers, stream conversions, and null-safe + * accessors
          • + *
        • {@link dev.metaschema.core.util.CustomCollectors} - Custom stream + * collectors
          • + *
        • {@link dev.metaschema.core.util.AutoCloser} - Adapter for making + * resources {@link AutoCloseable}
          • + *
        • {@link dev.metaschema.core.util.StringUtils} - String manipulation and + * validation
          • + *
        • {@link dev.metaschema.core.util.UriUtils} - URI resolution and + * manipulation
          • + *
        • {@link dev.metaschema.core.util.DeleteOnShutdown} - Temporary file + * cleanup
          • + *
        • {@link dev.metaschema.core.util.IVersionInfo} - Version information + * interface
          • + *
        + *

        + * These utilities are primarily designed for internal framework use but may + * also be useful for applications built on the Metaschema framework. + */ + +package dev.metaschema.core.util; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/package-info.java deleted file mode 100644 index 5315f5742..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/configuration/package-info.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides a type-safe configuration framework for processors and parsers. - *

        - * This package implements a feature-based configuration system inspired by - * Jackson's configuration model. Configuration options are defined as - * strongly-typed features that can be queried and modified through immutable or - * mutable configuration interfaces. - *

        - * Key interfaces and classes: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.configuration.IConfigurationFeature} - * - Defines a configuration option with a name, type, and default value
          • - *
        • {@link gov.nist.secauto.metaschema.core.configuration.IConfiguration} - - * Immutable view of configuration state for querying feature values
          • - *
        • {@link gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration} - * - Mutable view allowing feature values to be modified
          • - *
        • {@link gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration} - * - Standard implementation of mutable configuration
          • - *
        • {@link gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature} - * - Base class for implementing configuration features
          • - *
        - *

        - * Usage example: - * - * 

        - * // Define a feature
- * IConfigurationFeature<Boolean> PRETTY_PRINT = ...;
- *
- * // Create and configure
- * IMutableConfiguration<MyFeature> config = new DefaultConfiguration<>();
- * config.enableFeature(PRETTY_PRINT);
- *
- * // Query configuration
- * boolean enabled = config.isFeatureEnabled(PRETTY_PRINT);
- *
        - * - * @see gov.nist.secauto.metaschema.core.configuration.IConfigurationFeature - */ - -package gov.nist.secauto.metaschema.core.configuration; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/package-info.java deleted file mode 100644 index 9d9d83aab..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/mdm/impl/package-info.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides implementation classes for the Metaschema Document Model (MDM) - * interfaces defined in {@link gov.nist.secauto.metaschema.core.mdm}. - *

        - * This package contains the concrete implementations that support creating and - * managing in-memory document structures backed by Metaschema module - * definitions. These implementations handle the relationships between parent - * and child nodes, manage location information, and provide factory methods for - * creating new node instances. - *

        - * Key implementation classes include: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.AbstractDMNodeItem} - - * Base abstract implementation for all MDM node items
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.AbstractDMModelNodeItem} - * - Base for model node items (assemblies and fields) that support flags
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.DocumentNodeItem} - - * Implementation of document root nodes
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.DefinitionAssemblyNodeItem} - * - Assemblies created directly from definitions (orphaned from documents)
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.ChildAssemblyNodeItem} - - * Assemblies created as children of other nodes
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.DefinitionFieldNodeItem} - * - Fields created directly from definitions
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.ChildFieldNodeItem} - - * Fields created as children of other nodes
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.DefinitionFlagNodeItem} - * - Flags created directly from definitions
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.ChildFlagNodeItem} - - * Flags created as children of other nodes
          • - *
        - *

        - * Supporting interfaces in this package include: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.IDMModelNodeItem} - - * Interface for model nodes that support creating child flags
          • - *
        • {@link gov.nist.secauto.metaschema.core.mdm.impl.IFeatureChildNodeItem} - - * Interface for nodes that have a parent-child relationship
          • - *
        - *

        - * The implementation distinguishes between two types of node creation: - *

          - *
        • Definition-based nodes - Created directly from - * Metaschema definitions, orphaned from any document or parent node. These are - * typically used as entry points for creating new document structures.
          • - *
        • Child nodes - Created as children of existing nodes - * through instance references. These maintain parent-child relationships and - * are part of a larger document structure.
          • - *
        - */ - -package gov.nist.secauto.metaschema.core.mdm.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/package-info.java deleted file mode 100644 index 93d776515..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/items/package-info.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides concrete syntax tree (CST) node implementations for Metapath item - * expressions and sequence operations. - *

        - * This package implements various expression types as defined by - * XPath 3.1 that operate on items - * and sequences, including literals, sequence constructors, set operations, and - * quantified expressions. - * - *

        Key Classes and Interfaces

        - * - *

        Literal Expressions

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.ILiteralExpression} - * - Common interface for all literal value expressions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.AbstractLiteralExpression} - * - Base class for literal implementations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.IntegerLiteral} - * - Integer literal values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.DecimalLiteral} - * - Decimal literal values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.StringLiteral} - * - String literal values
          • - *
        - * - *

        Sequence Operations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.EmptySequence} - * - Empty parenthesized expression {@code ()}
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.SequenceExpression} - * - Comma-separated sequence of expressions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.Range} - Range - * expression ({@code to} operator)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.StringConcat} - * - String concatenation operator ({@code ||})
          • - *
        - * - *

        Set Operations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.Union} - Union - * of sequences ({@code union}, {@code |})
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.Intersect} - - * Intersection of sequences ({@code intersect})
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.Except} - - * Difference of sequences ({@code except})
          • - *
        - * - *

        Map and Filter Operations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.SimpleMap} - - * Simple map operator ({@code !})
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.AbstractFilterExpression} - * - Base class for filter expressions
          • - *
        - * - *

        Lookup Operations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.AbstractLookup} - * - Base class for lookup operations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.PostfixLookup} - * - Postfix lookup expression
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.UnaryLookup} - - * Unary lookup expression ({@code ?})
          • - *
        - * - *

        Array and Map Constructors

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySquareConstructor} - * - Square array constructor ({@code [ ]})
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.ArraySequenceConstructor} - * - Curly array constructor ({@code array { }})
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.MapConstructor} - * - Map constructor ({@code map { }})
          • - *
        - * - *

        Quantified Expressions

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.items.Quantified} - - * Quantified expressions ({@code some} and {@code every})
          • - *
        - * - *

        Usage Examples

        - * - * 
        - * // Literals: 42, 3.14, "hello"
- * // Empty sequence: ()
- * // Sequence: (1, 2, 3)
- * // Range: 1 to 10
- * // Union: $seq1 | $seq2
- * // Simple map: $items ! string(.)
- * // Quantified: some $x in $seq satisfies $x > 10
- *
        - * - * @see gov.nist.secauto.metaschema.core.metapath.item.IItem - * @see gov.nist.secauto.metaschema.core.metapath.item.ISequence - * @see gov.nist.secauto.metaschema.core.metapath.cst - */ - -package gov.nist.secauto.metaschema.core.metapath.cst.items; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/package-info.java deleted file mode 100644 index a502f08f7..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/math/package-info.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides concrete syntax tree (CST) node implementations for Metapath - * arithmetic expressions. - *

        - * This package implements arithmetic operations as defined by the - * XPath 3.1 arithmetic - * expressions specification. These operations support numeric calculations, - * date/time arithmetic, and duration operations. - * - *

        Key Classes

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.AbstractArithmeticExpression} - * - Base class for all arithmetic operations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.AbstractBasicArithmeticExpression} - * - Base class for basic binary arithmetic operations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.Addition} - - * Addition operator (+)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction} - - * Subtraction operator (-)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication} - * - Multiplication operator (*)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.Division} - - * Division operator (div)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.IntegerDivision} - * - Integer division operator (idiv)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.Modulo} - - * Modulo operator (mod)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math.Negate} - Unary - * negation operator (-)
          • - *
        - * - *

        Supported Operations

        - *

        - * Arithmetic expressions in this package support operations on: - *

          - *
        • Numeric types (integer, decimal, float, double)
          • - *
        • Date and time types (date, dateTime, time)
          • - *
        • Duration types (yearMonthDuration, dayTimeDuration)
          • - *
        - * - *

        Usage Example

        - * - * 
        - * // Numeric: 1 + 2 evaluates to 3
- * // Date arithmetic: xs:date('2023-01-01') + xs:yearMonthDuration('P1M')
- * // Evaluates to xs:date('2023-02-01')
- *
        - * - * @see gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem - * @see gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem - * @see gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem - */ - -package gov.nist.secauto.metaschema.core.metapath.cst.math; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/package-info.java deleted file mode 100644 index 9fd00dfbc..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/package-info.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides concrete syntax tree (CST) node implementations for Metapath - * expressions. - *

        - * Metapath is an XPath 3.1-based query language for navigating and querying - * Metaschema-based data. This package contains the expression implementations - * that form the executable representation of parsed Metapath queries. - * - *

        Package Structure

        - *

        - * This package is organized into several subpackages: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.math} - Arithmetic - * expressions (addition, subtraction, multiplication, division, etc.)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path} - Path - * navigation expressions (axes, steps, node tests)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.type} - Type - * operations (cast, castable, instance of, treat)
          • - *
        • {@code gov.nist.secauto.metaschema.core.metapath.cst.logic} - Boolean - * logic and comparison expressions
          • - *
        • {@code gov.nist.secauto.metaschema.core.metapath.cst.items} - Literal - * values, sequences, and collection operations
          • - *
        - * - *

        Key Classes and Interfaces

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.AbstractExpression} - * - Base class for all CST expression nodes
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.BuildCSTVisitor} - - * Transforms ANTLRv4 abstract syntax tree (AST) into executable CST nodes
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor} - * - Visitor pattern interface for processing CST nodes
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.CSTPrinter} - - * Debugging utility for visualizing CST structure
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.For} - For loop - * expressions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.Let} - Variable - * binding expressions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.StaticFunctionCall} - * - Static function invocation
          • - *
        - * - *

        Usage Context

        - *

        - * CST nodes are created by - * {@link gov.nist.secauto.metaschema.core.metapath.cst.BuildCSTVisitor} during - * Metapath expression compilation. Each CST node implements - * {@link gov.nist.secauto.metaschema.core.metapath.IExpression} and can be - * evaluated against a dynamic context to produce results. - * - * @see gov.nist.secauto.metaschema.core.metapath.IExpression - * @see gov.nist.secauto.metaschema.core.metapath.DynamicContext - */ - -package gov.nist.secauto.metaschema.core.metapath.cst; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/package-info.java deleted file mode 100644 index 617300c82..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/package-info.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides concrete syntax tree (CST) node implementations for Metapath path - * navigation expressions. - *

        - * This package implements path expressions as defined by - * XPath 3.1 path - * expressions and XPath 3.1 - * axes. Path expressions enable navigation through Metaschema document - * structures using axes, steps, and predicates. - * - *

        Key Classes and Interfaces

        - * - *

        Path Expression Nodes

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.AbstractPathExpression} - * - Base class for all path expressions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath} - * - Absolute path starting with {@code /}
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath} - * - Root-only path expression {@code /}
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath} - * - Absolute descendant path starting with {@code //}
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath} - * - Relative path using {@code /} separator
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath} - * - Relative descendant path using {@code //} separator
          • - *
        - * - *

        Step Expressions

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.Step} - - * Individual step in a path expression combining axis and node test
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.Axis} - - * Enumeration of XPath axes (child, parent, ancestor, descendant, etc.)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstanceStep} - * - Step for navigating model instances (assembly/field children)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.FlagStep} - - * Step for navigating flag children
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem} - - * The context item expression {@code .}
          • - *
        - * - *

        Node Tests

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.INodeTestExpression} - * - Interface for node test expressions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.NameNodeTest} - - * Tests nodes by qualified name
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.KindNodeTest} - - * Tests nodes by kind (element, attribute, etc.)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.WildcardNodeTest} - * - Wildcard node test ({@code *}, {@code prefix:*}, {@code *:local})
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.cst.path.IWildcardMatcher} - * - Interface for wildcard matching strategies
          • - *
        - * - *

        Usage Example

        - * - * 
        - * // Absolute path: /catalog/group/control
- * // Descendant search: //control[@id='ac-1']
- * // Relative path: parent/child
- * // Context item: .
- * // Wildcard: control/*
- *
        - * - * @see gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem - * @see gov.nist.secauto.metaschema.core.metapath.cst - */ - -package gov.nist.secauto.metaschema.core.metapath.cst.path; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/package-info.java deleted file mode 100644 index 38178d8f5..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/package-info.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides the core framework for defining and executing Metapath functions. - *

        - * This package contains the foundational interfaces and classes for - * implementing functions that can be called within Metapath expressions. It - * supports function registration, resolution, and execution based on the XPath - * 3.1 function model. - * - *

        Key Interfaces

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.IFunction} - - * Represents a function signature with its name, arguments, return type, and - * properties
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary} - * - Provides access to a collection of function signatures
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.IFunctionExecutor} - * - Executes a function with provided arguments
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.IArgument} - - * Represents a single function argument signature
          • - *
        - * - *

        Key Classes

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.DefaultFunction} - * - Concrete implementation of a function signature
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.FunctionService} - * - Service-based function discovery using Java ServiceLoader
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary} - * - Registry for organizing and looking up functions
          • - *
        - * - *

        Usage

        - *

        - * Functions are registered in libraries and resolved by name and arity during - * Metapath expression evaluation. The {@code FunctionService} loads function - * libraries using the Java ServiceLoader mechanism, making them available to - * the Metapath evaluator. - * - * @see gov.nist.secauto.metaschema.core.metapath.function.library - */ - -package gov.nist.secauto.metaschema.core.metapath.function; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/package-info.java deleted file mode 100644 index 98643720a..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/package-info.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Internal implementation classes supporting the Metapath expression engine. - *

        - * This package contains concrete implementations of core Metapath abstractions - * including expression compilation, evaluation, sequence management, and error - * handling. These classes are primarily used internally by the Metapath - * evaluator and are subject to change between releases. - *

        - * Key implementation classes: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.MetapathExpression} - * - Main implementation of - * {@link gov.nist.secauto.metaschema.core.metapath.IMetapathExpression}, - * providing expression compilation from Metapath strings using ANTLR4 parsing - * and CST generation
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.LazyCompilationMetapathExpression} - * - Defers expression compilation until first evaluation for performance - * optimization
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.AbstractSequence} - - * Base class for immutable sequence implementations backed by unmodifiable - * lists
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.SingletonSequence} - * - Optimized sequence containing exactly one item
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.SequenceN} - - * General-purpose sequence containing zero or more items
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.StreamSequence} - - * Lazy sequence backed by a stream for efficient memory usage with large result - * sets
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.ErrorCodeImpl} - - * Implementation of - * {@link gov.nist.secauto.metaschema.core.metapath.IErrorCode} for Metapath - * error reporting
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapKey} - - * Base class for map key implementations used in Metapath map operations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.impl.IFeatureCollectionFunctionItem} - * - Support for function items in map/array collections
          • - *
        - *

        - * This package is considered an implementation detail and should not be - * directly referenced by application code. Use the public API in - * {@link gov.nist.secauto.metaschema.core.metapath} instead. - * - * @see gov.nist.secauto.metaschema.core.metapath - * @see gov.nist.secauto.metaschema.core.metapath.IMetapathExpression - * @see gov.nist.secauto.metaschema.core.metapath.item.ISequence - */ - -package gov.nist.secauto.metaschema.core.metapath.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/package-info.java deleted file mode 100644 index 9edb8f59a..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/impl/package-info.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Concrete implementations of atomic item types for the Metapath type system. - *

        - * This package provides the internal implementation classes for all atomic item - * types defined in - * {@link gov.nist.secauto.metaschema.core.metapath.item.atomic}. Each - * implementation class wraps a native Java value and provides Metapath - * operations, comparisons, and type conversions according to XPath 3.1 - * semantics. - * - *

        Base Implementation Classes

        - *

        - * The package includes abstract base classes that provide common functionality - * for related atomic types: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractStringItem} - * - Base for string-based types providing whitespace normalization and string - * operations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractIntegerItem} - * - Base for integer types providing numeric operations and conversions
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractDecimalItem} - * - Base for decimal numeric types
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractTemporalItem} - * - Base for date/time types
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractDateItem} - * - Base for date values with optional timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractTimeItem} - * - Base for time values with optional timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractDateTimeItem} - * - Base for combined date/time values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractDurationItem} - * - Base for duration types
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractBinaryItem} - * - Base for binary data types (base64 and hex)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractUriItem} - * - Base for URI-related types
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractMarkupItem} - * - Base for markup content types
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AbstractIPAddressItem} - * - Base for IP address types (v4 and v6)
          • - *
        - * - *

        String and Text Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.StringItemImpl} - * - Standard string values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.TokenItemImpl} - * - Normalized whitespace strings
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.NcNameItemImpl} - * - XML NCNames (non-colonized names)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.MarkupLineItemImpl} - * - Single-line formatted text
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.MarkupMultiLineItemImpl} - * - Multi-line formatted text
          • - *
        - * - *

        Numeric Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IntegerItemImpl} - * - Arbitrary-precision integer values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.NonNegativeIntegerItemImpl} - * - Non-negative integers (zero or positive)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.PositiveIntegerItemImpl} - * - Strictly positive integers
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DecimalItemImpl} - * - Decimal numeric values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.BooleanItemImpl} - * - Boolean true/false values
          • - *
        - * - *

        Temporal Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateTimeWithTimeZoneItemImpl} - * - Date/time values with explicit timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateTimeWithoutTimeZoneItemImpl} - * - Date/time values without timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateWithTimeZoneItemImpl} - * - Date values with timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DateWithoutTimeZoneItemImpl} - * - Date values without timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.TimeWithTimeZoneItemImpl} - * - Time values with timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.TimeWithoutTimeZoneItemImpl} - * - Time values without timezone
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.DayTimeDurationItemImpl} - * - Durations measured in days/hours/minutes/seconds
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.YearMonthDurationItemImpl} - * - Durations measured in years/months
          • - *
        - * - *

        URI and Network Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.AnyUriItemImpl} - * - Arbitrary URI values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.UriReferenceItemImpl} - * - URI references (absolute or relative)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.EmailAddressItemImpl} - * - Email address values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.HostnameItemImpl} - * - DNS hostname values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IPv4AddressItemImpl} - * - IPv4 address values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.IPv6AddressItemImpl} - * - IPv6 address values
          • - *
        - * - *

        Binary and Other Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.Base64BinaryItemImpl} - * - Base64-encoded binary data
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.HexBinaryItem} - * - Hex-encoded binary data
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.QNameItemImpl} - * - Qualified names with namespace
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.impl.UuidItemImpl} - * - UUID/GUID values
          • - *
        - *

        - * Each implementation class is paired with a corresponding - * {@link gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter} that - * handles parsing from string representations, validation, and serialization - * for XML/JSON output. - *

        - * This package is considered an implementation detail. Application code should - * use the public interfaces in - * {@link gov.nist.secauto.metaschema.core.metapath.item.atomic} and factory - * methods like {@code IStringItem.valueOf()} rather than directly instantiating - * these implementation classes. - * - * @see gov.nist.secauto.metaschema.core.metapath.item.atomic - * @see gov.nist.secauto.metaschema.core.datatype - * @see XPath - * 3.1 Data Model: Atomic Values - */ - -package gov.nist.secauto.metaschema.core.metapath.item.atomic.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/package-info.java deleted file mode 100644 index 6fc111b59..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/package-info.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Atomic item types representing indivisible values in the Metapath type - * system. - *

        - * This package provides interfaces and implementations for atomic items, which - * are fundamental data values that cannot be decomposed into smaller units. - * Atomic items correspond to simple types in XPath 3.1 and include primitive - * types, numeric types, temporal types, and Metaschema-specific types. - *

        - * Core atomic type interfaces include: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem} - * - Base interface for all atomic items
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem} - * - Text values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem} - * - Numeric value base interface
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem} - * - Integer values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem} - * - Decimal values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem} - * - Boolean values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem} - * - Date and time values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IUriReferenceItem} - * - URI references
          • - *
        - *

        - * Metaschema-specific atomic types include: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem} - * - Formatted text with inline markup
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IEmailAddressItem} - * - Email addresses
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IHostnameItem} - * - Hostnames
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPAddressItem} - * - IP addresses (v4 and v6)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem} - - * UUIDs
          • - *
        - *

        - * Atomic items support type conversions, comparisons, and operations as defined - * by the XPath 3.1 Functions and Operators specification. Each atomic type is - * backed by a corresponding - * {@link gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter} that - * handles value parsing, validation, and serialization. - * - * @see XPath - * 3.1 Data Model: Atomic Values - * @see XPath 3.1 Functions - * and Operators - */ - -package gov.nist.secauto.metaschema.core.metapath.item.atomic; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/package-info.java deleted file mode 100644 index 9d9fccac6..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/impl/package-info.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides concrete implementations of Metapath function items (arrays and - * maps). - *

        - * This package contains the implementation classes for the function item - * interfaces defined in - * {@link gov.nist.secauto.metaschema.core.metapath.item.function}. These - * classes provide immutable, efficient implementations of arrays and maps for - * use in Metapath expressions. - * - *

        Array Implementations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractArrayItem} - * - Base class for all array item implementations, providing common utility - * methods
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.ArrayItemN} - * - Array implementation that supports an unbounded number of members
          • - *
        - * - *

        Map Implementations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractMapItem} - * - Base class for all map item implementations, providing common utility - * methods including the function call interface for map lookup
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.MapItemN} - * - Map implementation that supports an unbounded number of entries
          • - *
        - * - *

        Map Key Implementations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractStringMapKey} - * - Base implementation for string-based map keys
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.AbstractKeySpecifier} - * - Base implementation for key specifier that computes keys from items
          • - *
        - * - *

        Utility Classes

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.ImmutableCollections} - * - Utility classes for creating immutable collection wrappers
          • - *
        - * - *

        Exceptions

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.impl.ArrayMetapathException} - * - Base exception for array-related errors
          • - *
        - * - *

        Implementation Notes

        - *

        - * All array and map implementations in this package are immutable. Attempts to - * modify them through the {@link java.util.List} or {@link java.util.Map} - * interfaces will throw {@link UnsupportedOperationException}. - *

        - * Array indices in the public API are 1-based (following XPath 3.1 - * conventions), but are converted to 0-based indices internally when accessing - * the underlying Java collections. - * - * @see gov.nist.secauto.metaschema.core.metapath.item.function - */ - -package gov.nist.secauto.metaschema.core.metapath.item.function.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/package-info.java deleted file mode 100644 index ca951b05d..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/package-info.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides support for Metapath function items, including arrays and maps. - *

        - * This package implements the XPath 3.1 function item types, including arrays - * and maps. These are first-class values in Metapath that can be passed as - * arguments, returned from functions, and stored in sequences. - * - *

        Array Items

        - *

        - * Arrays are ordered collections of values, where each value is a sequence. - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem} - * - The main interface for array items, implementing - * {@link java.util.List}
          • - *
        - *

        - * Arrays are immutable once created and support operations like getting members - * by position (1-indexed), determining size, and conversion to sequences. - * Factory methods are provided for creating arrays with various numbers of - * members. - * - *

        Map Items

        - *

        - * Maps are unordered collections of key-value pairs, where keys must be atomic - * items and values are sequences. - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem} - * - The main interface for map items, implementing {@link java.util.Map}
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey} - - * The key type used in maps, wrapping atomic items with proper equality - * semantics
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier} - * - Interface for computing map keys from items
          • - *
        - *

        - * Maps are immutable once created and support operations like getting values by - * key, determining size, and merging maps. Factory methods are provided for - * creating maps with various numbers of entries. - * - *

        Map Key Types

        - *

        - * Different atomic types use different equality semantics for map keys: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IStringMapKey} - * - Keys for string-based types (string, anyURI)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IDecimalMapKey} - * - Keys for numeric types (decimal, integer, float, double)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.ITemporalMapKey} - * - Keys for date/time types (date, dateTime, time)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.ICalendarMapKey} - * - Keys for calendar-based types
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IOpaqueMapKey} - * - Keys for types with identity-based equality (boolean, QName, etc.)
          • - *
        - * - *

        Exceptions

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException} - * - Thrown when accessing an array with an out-of-bounds index
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException} - * - Thrown when attempting to create an array with a negative length
          • - *
        - * - * @see gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem - * @see gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem - */ - -package gov.nist.secauto.metaschema.core.metapath.item.function; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/package-info.java deleted file mode 100644 index ac2855ef2..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/package-info.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Node item types representing structured data in the Metapath type system. - *

        - * This package provides interfaces and implementations for node items, which - * form tree-structured graphs representing both Metaschema models (module - * definitions) and data instances conforming to those models. Node items enable - * navigation and querying of hierarchical data using Metapath expressions. - *

        - * Core node type interfaces include: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem} - - * Base interface for all node items
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem} - * - Document root node representing a data instance
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem} - * - Assembly nodes containing nested structures
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem} - * - Field nodes containing values and flags
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem} - * - Flag nodes containing simple values
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem} - * - Module definition nodes representing Metaschema schemas
          • - *
        - *

        - * Node items support: - *

          - *
        • XPath-style navigation (parent, child, ancestor, descendant - * relationships)
          • - *
        • Document order traversal for predictable query results
          • - *
        • Access to typed values through - * {@link gov.nist.secauto.metaschema.core.metapath.item.node.IAtomicValuedNodeItem}
          • - *
        • Visitor pattern traversal via - * {@link gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemVisitor}
          • - *
        • Factory-based creation through - * {@link gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory}
          • - *
        - *

        - * Node items integrate with Metaschema model definitions in - * {@link gov.nist.secauto.metaschema.core.model}, providing runtime - * representations that can be queried using Metapath expressions. Each node - * maintains references to its definition (schema-level metadata) and its - * position within the document tree. - * - * @see XPath 3.1 Data - * Model: Nodes - * @see gov.nist.secauto.metaschema.core.model - */ - -package gov.nist.secauto.metaschema.core.metapath.item.node; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/package-info.java deleted file mode 100644 index b299e4408..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/package-info.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Core interfaces and classes for the Metapath item type system. - *

        - * This package provides the foundational abstractions for representing values - * in Metapath expressions, aligning with the XPath 3.1 Data Model. All Metapath - * values are either items or sequences of items. - *

        - * Key interfaces include: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.IItem} - Base - * interface for all Metapath items (atomic values, nodes, functions, arrays, - * and maps)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.ISequence} - - * Ordered collection of items representing expression evaluation results
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue} - - * Common interface for values that can be stored in arrays or maps
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor} - - * Visitor pattern interface for traversing item hierarchies
          • - *
        - *

        - * The type system integrates with Metaschema data types defined in - * {@link gov.nist.secauto.metaschema.core.datatype} while extending them to - * support the full XPath 3.1 type hierarchy including atomic items, node items, - * and function items. - * - * @see XPath 3.1 Specification - * @see XPath 3.1 Data - * Model - */ - -package gov.nist.secauto.metaschema.core.metapath.item; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/package-info.java deleted file mode 100644 index 02ca09b7f..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/impl/package-info.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides concrete implementations of the Metapath type system interfaces. - *

        - * This package contains the implementation classes for the Metapath type system - * defined in {@link gov.nist.secauto.metaschema.core.metapath.type}. These - * classes provide the runtime type checking, validation, and testing mechanisms - * used throughout the Metapath implementation. - * - *

        Item Type Implementations

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.AnyItemType} - - * A type that matches any item (item())
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.AnyFunctionItemType} - * - A type that matches any function item
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.AbstractItemType} - * - Base class for custom item type implementations
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.NonAdapterAtomicItemType} - * - Item type for atomic types that are not backed by data type adapters
          • - *
        - * - *

        Node Kind Tests

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.AnyKindTest} - - * Singleton tests for matching any node, document, assembly, field, or - * flag
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.AbstractDefinitionTest} - * - Base class for tests that match nodes by name and/or definition type
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.KindDocumentTestImpl} - * - Tests for matching document nodes with optional root element type - * constraints
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.KindAssemblyTestImpl} - * - Tests for matching assembly nodes by name and/or type
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.KindFieldTestImpl} - * - Tests for matching field nodes by name and/or type
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.KindFlagTestImpl} - * - Tests for matching flag nodes by name and/or type
          • - *
        - * - *

        Collection Type Tests

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.ArrayTestImpl} - * - Tests for matching array items with optional member type constraints
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.MapTestImpl} - - * Tests for matching map items with key and value type constraints
          • - *
        - * - *

        Sequence Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.SequenceTypeImpl} - * - Implementation of sequence type testing with occurrence validation
          • - *
        - * - *

        Type Constants

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.TypeConstants} - * - Provides singleton instances for abstract atomic types (any-atomic-type, - * duration, ip-address, numeric)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.impl.DynamicTypeSupport} - * - Utility methods for dynamic type operations
          • - *
        - * - * @see gov.nist.secauto.metaschema.core.metapath.type - */ - -package gov.nist.secauto.metaschema.core.metapath.type.impl; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/package-info.java deleted file mode 100644 index 9e4b9eca9..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/package-info.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides support for Metapath type system and sequence type testing. - *

        - * This package implements the Metapath type system, which is based on the XPath - * 3.1 type system. It provides mechanisms for type testing, type matching, and - * type validation of Metapath items and sequences. - *

        - * The core interfaces define type information that can be used to: - *

          - *
        • Test if an item or sequence matches a specific type
          • - *
        • Validate sequences against expected types and cardinality
          • - *
        • Perform type casting and conversion operations
          • - *
        • Generate type signatures for error messages and debugging
          • - *
        - * - *

        Key Interfaces

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.IItemType} - The - * base type interface for all item types, providing factory methods for - * creating tests for atomic types, node kinds, functions, arrays, and maps
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.ISequenceType} - - * Represents a sequence type with cardinality constraints (occurrence - * indicators)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.IKindTest} - A - * specialized item type for testing node items by their kind (document, - * assembly, field, flag)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType} - * - Represents atomic types and union types that can be used for type testing - * and value conversion
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.IArrayTest} - - * Specialized item type for testing array items with member type - * constraints
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.IMapTest} - - * Specialized item type for testing map items with key and value type - * constraints
          • - *
        - * - *

        Supporting Classes

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.Occurrence} - Enum - * representing sequence cardinality indicators (zero, one, zero-or-one, - * one-or-more, zero-or-more)
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.DataTypeItemType} - - * Item type implementation for Metaschema data types backed by adapters
          • - *
        - * - *

        Exceptions

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException} - * - Base exception for type-related errors
          • - *
        • {@link gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException} - * - Thrown when a value does not match the expected type
          • - *
        - * - * @see gov.nist.secauto.metaschema.core.metapath.type.IItemType - * @see gov.nist.secauto.metaschema.core.metapath.type.ISequenceType - */ - -package gov.nist.secauto.metaschema.core.metapath.type; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/package-info.java deleted file mode 100644 index 0ac81de9b..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/package-info.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Metaschema constraint definitions and validation framework. - *

        - * This package provides the constraint system for Metaschema, which allows - * defining and enforcing validation rules on model instances. Constraints can - * restrict allowed values, enforce cardinality, ensure uniqueness, validate - * patterns, and establish referential integrity through index relationships. - *

        Constraint Types

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint} - * - Restricts values to a defined set
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint} - * - Enforces occurrence requirements (min/max)
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint} - * - Validates that a condition is true
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint} - * - Validates values against regex patterns
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint} - * - Ensures uniqueness of key field combinations
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint} - * - Creates an index over items for referential integrity
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint} - * - Verifies that references exist in an index
          • - *
        - *

        Validation

        - *

        - * The - * {@link gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator} - * provides the main entry point for validating model instances against their - * constraints. Validation results are reported through - * {@link gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler} - * implementations. - *

        Usage Context

        - *

        - * Constraints can be: - *

          - *
        • Defined inline within Metaschema definitions
          • - *
        • Applied externally through constraint sets
          • - *
        • Evaluated during content validation and data binding
          • - *
        • Used to generate validation rules for JSON Schema and XML Schema
          • - *
        - * - * @see gov.nist.secauto.metaschema.core.model.constraint.IConstraint - * @see gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidator - */ - -package gov.nist.secauto.metaschema.core.model.constraint; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/package-info.java deleted file mode 100644 index 1eb0db36c..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/package-info.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Core Metaschema model interfaces and implementations. - *

        - * This package defines the fundamental object model for Metaschema modules, - * including definitions (assemblies, fields, flags), instances, and their - * relationships. It provides both the API contracts and abstract base - * implementations for representing Metaschema structures. - *

        Key Interfaces

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.model.IModule} - Represents a - * Metaschema module containing definitions
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.IAssemblyDefinition} - - * Defines a complex assembly structure
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.IFieldDefinition} - Defines - * a field with optional value and flags
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.IFlagDefinition} - Defines - * a flag (simple name-value pair)
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.IModelInstance} - - * Represents an instance of a definition within a model
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.IContainerModel} - - * Represents a container that can hold model instances
          • - *
        - *

        Usage Context

        - *

        - * This package is used by: - *

          - *
        • Metaschema module loaders to construct in-memory representations of - * modules
          • - *
        • Databinding implementations to map between Java objects and Metaschema - * structures
          • - *
        • Code generators to produce Java classes from Metaschema definitions
          • - *
        • Validation and constraint processing to enforce structural rules
          • - *
        - * - * @see gov.nist.secauto.metaschema.core.model.constraint - * @see gov.nist.secauto.metaschema.core.model.validation - */ - -package gov.nist.secauto.metaschema.core.model; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/package-info.java deleted file mode 100644 index 888116f25..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/package-info.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Utility classes for Metaschema model processing and manipulation. - *

        - * This package provides helper classes and utilities for working with - * Metaschema models, including JSON/XML parsing utilities, diagram generation, - * and module manipulation tools. - *

        Key Classes

        - *
          - *
        • {@link gov.nist.secauto.metaschema.core.model.util.JsonUtil} - JSON - * parsing and utility methods
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.util.XmlUtil} - XML - * processing and utility methods
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.util.XmlEventUtil} - StAX - * XML event stream utilities
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.util.ModuleUtils} - Module - * traversal and manipulation utilities
          • - *
        • {@link gov.nist.secauto.metaschema.core.model.util.MermaidErDiagramGenerator} - * - Generates Mermaid ER diagrams from Metaschema modules
          • - *
        - *

        Usage Context

        - *

        - * These utilities support: - *

          - *
        • Content serialization and deserialization
          • - *
        • Model visualization and documentation
          • - *
        • Module analysis and traversal
          • - *
        • Low-level parsing operations
          • - *
        - */ - -package gov.nist.secauto.metaschema.core.model.util; diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/package-info.java deleted file mode 100644 index 552b14813..000000000 --- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/package-info.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides utility classes for common operations throughout the Metaschema - * framework. - *

        - * This package contains helper classes for working with collections, objects, - * strings, URIs, and other common Java types. These utilities provide null-safe - * operations, type conversions, and enhanced functionality beyond standard Java - * libraries. - *

        - * Key utility classes: - *

          - *
        • {@link gov.nist.secauto.metaschema.core.util.ObjectUtils} - Null-safety - * assertions and object validation ({@code notNull}, - * {@code requireNonNull})
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.CollectionUtil} - Collection - * operations including unmodifiable wrappers, stream conversions, and null-safe - * accessors
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.CustomCollectors} - Custom - * stream collectors
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.AutoCloser} - Adapter for - * making resources {@link AutoCloseable}
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.StringUtils} - String - * manipulation and validation
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.UriUtils} - URI resolution - * and manipulation
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.DeleteOnShutdown} - - * Temporary file cleanup
          • - *
        • {@link gov.nist.secauto.metaschema.core.util.IVersionInfo} - Version - * information interface
          • - *
        - *

        - * These utilities are primarily designed for internal framework use but may - * also be useful for applications built on the Metaschema framework. - */ - -package gov.nist.secauto.metaschema.core.util; diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index 6275bf920..caa26ba77 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -import gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary; -import gov.nist.secauto.metaschema.core.metapath.function.library.DefaultFunctionLibrary; +import dev.metaschema.core.datatype.IDataTypeProvider; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.metapath.function.IFunctionLibrary; +import dev.metaschema.core.metapath.function.library.DefaultFunctionLibrary; /** * @provides IDataTypeProvider for core built-in data types * @provides IFunctionLibrary for core built-in Metapath functions * @uses IDataTypeProvider to discover data types implementing - * {@link gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter} + * {@link dev.metaschema.core.datatype.IDataTypeAdapter} * @uses IFunctionLibrary to discover collections of Metapath functions * implementing - * {@link gov.nist.secauto.metaschema.core.metapath.function.IFunction} + * {@link dev.metaschema.core.metapath.function.IFunction} */ @SuppressWarnings("requires-transitive-automatic") -module gov.nist.secauto.metaschema.core { +module dev.metaschema.core { // requirements requires java.base; requires java.xml; @@ -63,31 +63,31 @@ requires transitive flexmark.util.sequence; requires flexmark.util.visitor; - exports gov.nist.secauto.metaschema.core; - exports gov.nist.secauto.metaschema.core.configuration; - exports gov.nist.secauto.metaschema.core.datatype; - exports gov.nist.secauto.metaschema.core.datatype.adapter; - exports gov.nist.secauto.metaschema.core.datatype.markup; - exports gov.nist.secauto.metaschema.core.datatype.object; - exports gov.nist.secauto.metaschema.core.metapath; - exports gov.nist.secauto.metaschema.core.metapath.format; - exports gov.nist.secauto.metaschema.core.metapath.function; - exports gov.nist.secauto.metaschema.core.metapath.function.library; - exports gov.nist.secauto.metaschema.core.metapath.function.regex; - exports gov.nist.secauto.metaschema.core.metapath.item; - exports gov.nist.secauto.metaschema.core.metapath.item.atomic; - exports gov.nist.secauto.metaschema.core.metapath.item.function; - exports gov.nist.secauto.metaschema.core.metapath.item.node; - exports gov.nist.secauto.metaschema.core.metapath.type; - exports gov.nist.secauto.metaschema.core.model; - exports gov.nist.secauto.metaschema.core.model.constraint; - exports gov.nist.secauto.metaschema.core.model.util; - exports gov.nist.secauto.metaschema.core.model.validation; - exports gov.nist.secauto.metaschema.core.qname; - exports gov.nist.secauto.metaschema.core.util; + exports dev.metaschema.core; + exports dev.metaschema.core.configuration; + exports dev.metaschema.core.datatype; + exports dev.metaschema.core.datatype.adapter; + exports dev.metaschema.core.datatype.markup; + exports dev.metaschema.core.datatype.object; + exports dev.metaschema.core.metapath; + exports dev.metaschema.core.metapath.format; + exports dev.metaschema.core.metapath.function; + exports dev.metaschema.core.metapath.function.library; + exports dev.metaschema.core.metapath.function.regex; + exports dev.metaschema.core.metapath.item; + exports dev.metaschema.core.metapath.item.atomic; + exports dev.metaschema.core.metapath.item.function; + exports dev.metaschema.core.metapath.item.node; + exports dev.metaschema.core.metapath.type; + exports dev.metaschema.core.model; + exports dev.metaschema.core.model.constraint; + exports dev.metaschema.core.model.util; + exports dev.metaschema.core.model.validation; + exports dev.metaschema.core.qname; + exports dev.metaschema.core.util; - exports gov.nist.secauto.metaschema.core.datatype.markup.flexmark - to gov.nist.secauto.metaschema.databind; + exports dev.metaschema.core.datatype.markup.flexmark + to dev.metaschema.databind; // make bundled schemas and related resources available for use opens schema.json; @@ -95,7 +95,7 @@ opens schema.metaschema; // allow reflection on data types - opens gov.nist.secauto.metaschema.core.datatype.markup; + opens dev.metaschema.core.datatype.markup; // services uses IDataTypeProvider; diff --git a/core/src/main/resources/META-INF/services/dev.metaschema.core.datatype.IDataTypeProvider b/core/src/main/resources/META-INF/services/dev.metaschema.core.datatype.IDataTypeProvider new file mode 100644 index 000000000..55ecacccd --- /dev/null +++ b/core/src/main/resources/META-INF/services/dev.metaschema.core.datatype.IDataTypeProvider @@ -0,0 +1,2 @@ +dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider +dev.metaschema.core.datatype.markup.MarkupDataTypeProvider diff --git a/core/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary b/core/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary new file mode 100644 index 000000000..24e9fd3bd --- /dev/null +++ b/core/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary @@ -0,0 +1 @@ +dev.metaschema.core.metapath.function.library.DefaultFunctionLibrary diff --git a/core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider b/core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider deleted file mode 100644 index e85626b94..000000000 --- a/core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider +++ /dev/null @@ -1,2 +0,0 @@ -gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider -gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider diff --git a/core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary b/core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary deleted file mode 100644 index 9d5c17a7e..000000000 --- a/core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary +++ /dev/null @@ -1 +0,0 @@ -gov.nist.secauto.metaschema.core.metapath.function.library.DefaultFunctionLibrary diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64AdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/Base64AdapterTest.java similarity index 98% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64AdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/Base64AdapterTest.java index f23d66826..3e07b0628 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64AdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/Base64AdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java similarity index 90% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java index bb71b61aa..919fe1792 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,7 +12,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java index a16e4d5cc..48dd72ace 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDate; +import dev.metaschema.core.datatype.object.AmbiguousDate; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java index 58bd045a5..dce746c80 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDateTime; +import dev.metaschema.core.datatype.object.AmbiguousDateTime; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapterTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapterTest.java index 196016335..38bacc924 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapterTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapterTest.java index 8d5dec4b1..f7376b853 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java similarity index 61% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java index 482c01a1d..63f542160 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.datatype.DataTypeService; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.datatype.DataTypeService; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/UuidAdapterTest.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/adapter/UuidAdapterTest.java index 8cfe486ac..2a295d3d5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/UuidAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.adapter; +package dev.metaschema.core.datatype.adapter; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/CommonmarkConformanceTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java similarity index 98% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/CommonmarkConformanceTest.java rename to core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java index cd9b5861d..e7db7e431 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/CommonmarkConformanceTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nist.secauto.metaschema.core.MetaschemaConstants; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLStreamWriter2; import org.jsoup.Jsoup; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java similarity index 97% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java rename to core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java index 93529c84b..0b832547d 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup; +package dev.metaschema.core.datatype.markup; import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; @@ -17,9 +17,9 @@ import com.vladsch.flexmark.util.ast.Document; import com.vladsch.flexmark.util.ast.Node; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; +import dev.metaschema.core.util.CollectionUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java similarity index 91% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java rename to core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java index e8d998f97..0c841e8bd 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; +package dev.metaschema.core.datatype.markup.flexmark; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertTrue; import com.ctc.wstx.stax.WstxInputFactory; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.datatype.markup.XmlMarkupParser; -import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; -import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.XmlMarkupParser; +import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.util.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java rename to core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java index ce9a6babf..60ac7f94c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; +package dev.metaschema.core.datatype.markup.flexmark; import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.MarkupMultiline; import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextFocusTest.java b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java similarity index 95% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextFocusTest.java rename to core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java index dd92a1cb7..19fad6922 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextFocusTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,8 +12,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextTest.java b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextTest.java rename to core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java index bb2d19ba7..073820f06 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/DynamicContextTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor; -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.model.IUriResolver; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +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.model.IUriResolver; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ErrorHandlingTest.java b/core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java similarity index 95% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ErrorHandlingTest.java rename to core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java index 7e0cb95d6..b75b47b13 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ErrorHandlingTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.from; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.ArithmeticFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.function.ArithmeticFunctionException; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java b/core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java similarity index 90% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java rename to core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java index 052bb029b..be8ea1ed6 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionUtilsTest.java b/core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionUtilsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java index 3d4884e9d..79d32b239 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionUtilsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.cst.ExpressionUtils; -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.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +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.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/FocusContextTest.java b/core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/FocusContextTest.java rename to core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java index ed09b7640..e6c74073f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/FocusContextTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ISequenceTest.java b/core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java similarity index 87% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ISequenceTest.java rename to core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java index c4af27300..2a8a36e36 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ISequenceTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -15,13 +15,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java b/core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java index 8fda31a77..e040e0639 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -11,8 +11,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/StaticContextTest.java b/core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/StaticContextTest.java rename to core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java index 45b230abc..66b51552d 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/StaticContextTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @@ -12,8 +12,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java b/core/src/test/java/dev/metaschema/core/metapath/TestUtils.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java rename to core/src/test/java/dev/metaschema/core/metapath/TestUtils.java index 4ad534f9b..52d7382a9 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java +++ b/core/src/test/java/dev/metaschema/core/metapath/TestUtils.java @@ -3,32 +3,32 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath; +package dev.metaschema.core.metapath; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -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.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IQNameItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IQNameItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.IUuidItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java index 6078ccb37..ed45c4c13 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.eqname; +import static dev.metaschema.core.metapath.TestUtils.eqname; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression.ResultType; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.IMetapathExpression.ResultType; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java similarity index 79% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java index 12e25cec7..f5d52af20 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java index cdc45d59f..7e140f5d0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst; +package dev.metaschema.core.metapath.cst; import static com.github.seregamorph.hamcrest.MoreMatchers.where; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.eqname; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.eqname; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -23,36 +23,36 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.antlr.FailingErrorListener; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10; -import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10Lexer; -import gov.nist.secauto.metaschema.core.metapath.cst.items.SimpleMap; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.AbstractComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.And; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.GeneralComparison; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.If; -import gov.nist.secauto.metaschema.core.metapath.cst.logic.ValueComparison; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.IBooleanItem; -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.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.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.antlr.FailingErrorListener; +import dev.metaschema.core.metapath.antlr.Metapath10; +import dev.metaschema.core.metapath.antlr.Metapath10Lexer; +import dev.metaschema.core.metapath.cst.items.SimpleMap; +import dev.metaschema.core.metapath.cst.logic.AbstractComparison; +import dev.metaschema.core.metapath.cst.logic.And; +import dev.metaschema.core.metapath.cst.logic.GeneralComparison; +import dev.metaschema.core.metapath.cst.logic.If; +import dev.metaschema.core.metapath.cst.logic.ValueComparison; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.IUuidItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.ObjectUtils; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/items/QuantifiedTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/items/QuantifiedTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java index 04294adbf..5926f30b2 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/items/QuantifiedTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/items/RangeTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/items/RangeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java index 93536701c..ed538da73 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/items/RangeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.items; +package dev.metaschema.core.metapath.cst.items; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java similarity index 88% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java index 3ce490fb7..7a277eec6 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java index c8f07e49d..31c1ec568 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doReturn; @@ -11,14 +11,14 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -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.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/ValueComparisonTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java similarity index 89% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/ValueComparisonTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java index 1a1bc0902..ec1cc876d 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/logic/ValueComparisonTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.logic; +package dev.metaschema.core.metapath.cst.logic; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IExpression; -import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.function.ComparisonFunctions; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AdditionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java similarity index 79% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AdditionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java index f5ad45634..094bedda2 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/AdditionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.date; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.time; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.date; +import static dev.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.time; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/DivisionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java similarity index 79% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/DivisionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java index 006563edf..efb4f0816 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/DivisionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/IntegerDivisionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/IntegerDivisionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java index e0899d9bc..42bf941b1 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/IntegerDivisionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/ModuloTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/ModuloTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java index 213ce1b6a..b413d7a36 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/ModuloTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/MultiplicationTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/MultiplicationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java index 044fccdb4..70581cdb6 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/MultiplicationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/NegateTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/NegateTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java index c020fb265..574d893ea 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/NegateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/SubtractionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java similarity index 83% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/SubtractionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java index b2cab89fe..f4cf51d2f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/math/SubtractionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.math; +package dev.metaschema.core.metapath.cst.math; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.date; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.time; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.date; +import static dev.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.time; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/FlagStepTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java similarity index 71% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/FlagStepTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java index 12e42b3c7..c0b4975e1 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/FlagStepTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.NodeItemKind; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.NodeItemKind; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.qname.IEnhancedQName; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java similarity index 69% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java index 335d0c019..ccdb39ae0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; -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.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/StepTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java similarity index 97% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/StepTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java index fb2ee229d..1432fa195 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/path/StepTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.path; +package dev.metaschema.core.metapath.cst.path; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -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.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.ObjectUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/CastTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/CastTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java index 1f52242e5..643fd6884 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/CastTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; - -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.base64; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.date; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +package dev.metaschema.core.metapath.cst.type; + +import static dev.metaschema.core.metapath.TestUtils.base64; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.date; +import static dev.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidMetapathGrammarException; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/CastableTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/CastableTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java index daaf31326..8b41118c4 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/CastableTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.InvalidMetapathGrammarException; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/InstanceOfTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/InstanceOfTest.java rename to core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java index d545166cf..a092e8720 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/type/InstanceOfTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.cst.type; +package dev.metaschema.core.metapath.cst.type; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -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.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.atomic.IUuidItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatterTest.java b/core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatterTest.java rename to core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java index 9a02c5f07..6f2938f30 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/JsonPointerFormatterTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -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.IDocumentNodeItem; -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.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatterTest.java b/core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java similarity index 95% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatterTest.java rename to core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java index 891bde07d..cac352555 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/format/XPathFormatterTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.format; +package dev.metaschema.core.metapath.format; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -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.IDocumentNodeItem; -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.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunctionTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunctionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java index 2232b6765..4bb6b7356 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunctionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -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.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +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.atomic.IBooleanItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionServiceTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionServiceTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java index 9416ec5b7..8b973b346 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionServiceTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function; +package dev.metaschema.core.metapath.function; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,17 +14,17 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType; -import gov.nist.secauto.metaschema.core.metapath.type.Occurrence; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.metapath.type.Occurrence; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/impl/OperationFunctionsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/impl/OperationFunctionsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java index 4738b9cbc..510980295 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/impl/OperationFunctionsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java @@ -3,37 +3,37 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.impl; - -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.date; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.duration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.time; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +package dev.metaschema.core.metapath.function.impl; + +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.date; +import static dev.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.duration; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.time; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.from; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.function.ArithmeticFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.CastFunctionException; -import gov.nist.secauto.metaschema.core.metapath.function.DateTimeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.function.ArithmeticFunctionException; +import dev.metaschema.core.metapath.function.CastFunctionException; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppendTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java similarity index 70% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppendTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java index 8a49a51f6..f13868c2c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppendTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlattenTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlattenTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java index 5f0099d8c..3c8ec1cfd 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlattenTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGetTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGetTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java index 3170fcf96..bb2dcafee 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGetTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHeadTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java similarity index 67% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHeadTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java index 0e66adb54..9bca58fbf 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHeadTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java similarity index 75% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java index c2705a343..17fd61089 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoinTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoinTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java index efd13817f..ef8a530b0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoinTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPutTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPutTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java index af252ca96..89a20063c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPutTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemoveTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemoveTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java index 207ffb200..14e336080 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemoveTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java similarity index 71% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverseTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java index d3cab0911..df0111c15 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySizeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java similarity index 74% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySizeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java index 289eddf3d..55f022c77 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySizeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarrayTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarrayTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java index 4d4cdcddf..de203c44b 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarrayTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTailTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java similarity index 67% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTailTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java index 8243a943e..a522263bb 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTailTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.function.IArrayItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunctionTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunctionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java index afe1732cc..ee0867999 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunctionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java index 5be429705..1f2191731 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java similarity index 83% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java index 649e0c313..a4a581114 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java index 3893565d3..3a146e20e 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.date; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.date; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java index e4876c8d4..0b023d9c9 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.time; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.time; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITimeItem; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.qname.IEnhancedQName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvgTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java similarity index 70% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvgTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java index c6a651b8f..5ceff6e12 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvgTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUriTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUriTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java index 6cc2e32d3..b27545cad 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUriTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBooleanTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBooleanTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java index 9f9021b7a..181265ee3 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBooleanTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.uri; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.uri; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; import org.jmock.Expectations; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeilingTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java similarity index 74% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeilingTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java index c023a50e9..7bcf0df4c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeilingTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcatTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcatTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java index 2ad0a40d5..f38e939e5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcatTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnContainsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnContainsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java index edc72ac48..fe030fe3c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnContainsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCountTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java similarity index 61% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCountTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java index f1c19b935..e28204787 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCountTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; -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.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java similarity index 70% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java index 86f39cf05..77b1e6733 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCurrentTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertFalse; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDataTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDataTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java index 4adf18b0a..40dffae22 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDataTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java index 19fe5464d..b1369841c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.dateTime; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java similarity index 74% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java index 6d2833fa1..d09ad6c4d 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java index 5e50943b5..824941d92 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java index 18e374483..612072eb8 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDeepEqualTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDeepEqualTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java index 74d73bc20..9d810f136 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDeepEqualTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java index df4bb421e..5a2573196 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDistinctValuesTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java similarity index 70% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDistinctValuesTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java index 3eadbdbf0..fcd5cd1ff 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDistinctValuesTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java similarity index 75% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java index 3f7ec6be0..8d155b8f8 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUriTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUriTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java index c174950df..173264012 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUriTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEmptyTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEmptyTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java index db86e7f70..b1faa8c98 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEmptyTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEndsWithTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEndsWithTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java index f9dd405c7..0d0469026 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnEndsWithTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExactlyOneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExactlyOneTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java index 4c7418819..ca5b8706d 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExactlyOneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExistsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java similarity index 65% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExistsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java index 67f839a42..46fb53d68 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnExistsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.integer; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFalseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java similarity index 54% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFalseTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java index ba5ef0b43..ea770a8bb 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFalseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionArityTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java similarity index 70% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionArityTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java index 092a0ad23..33d6e93c8 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionArityTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -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.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.IMetapathExpression.ResultType; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionLookupTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java similarity index 75% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionLookupTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java index d6fc05071..4d1cf9706 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionLookupTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java similarity index 68% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionNameTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java index 0ee993746..dd44adeed 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnFunctionNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.qname; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.qname; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHasChildrenTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHasChildrenTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java index 401986987..500064af0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHasChildrenTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHeadTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java similarity index 71% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHeadTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java index 2506aea26..f35fb6bce 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHeadTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java index 5f71e394f..4e2d3e8df 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java index 36306d6e8..ea003cb94 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java index 2acc4a42b..c70171424 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java similarity index 68% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java index 8dde12304..921101971 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnIndexOfTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java similarity index 74% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnIndexOfTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java index c82d8ba06..e8b1fc64b 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnIndexOfTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInnermostTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInnermostTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java index b8b8de938..930dcf3d5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInnermostTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java @@ -4,20 +4,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBeforeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBeforeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java index 2194e9e37..1d229443b 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBeforeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLastTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLastTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java index 58f32f936..d7b382deb 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLastTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.FocusContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.FocusContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLocalNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLocalNameTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java index bfe01fe41..aad8684a4 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLocalNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLowerCaseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLowerCaseTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java index 0b99ec0d9..c5bd4ef93 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnLowerCaseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMatchesTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMatchesTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java index 321fd1f80..5b969140c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMatchesTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.from; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -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.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMaxTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMaxTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java index 0b325e4a8..11c3e1ff0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMaxTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.uri; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.uri; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java similarity index 75% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java index db7d9985e..a60b2f068 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java similarity index 75% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java index 0d008b43a..54efd0862 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java index 5229cd4bd..c8a219c57 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java similarity index 74% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java index c2ae1a441..6865b62d1 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java index 3195b699c..5d832e7ae 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java index a87d473a0..73ce4c408 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNameTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java index a43f4ef98..f1379676f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNamespaceUriTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNamespaceUriTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java index 873534275..98e547d75 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNamespaceUriTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java index f4875349b..11d02b02f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNotTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNotTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java index 278282ae0..50af13c75 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnNotTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.uri; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.uri; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -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.IBooleanItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; import org.jmock.Expectations; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOneOrMoreTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOneOrMoreTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java index eaf8ad00d..980b82ce2 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOneOrMoreTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOutermostTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOutermostTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java index ff8f81252..634aa945f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnOutermostTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java @@ -4,20 +4,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPathTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java similarity index 87% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPathTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java index 2286d3817..885c6a223 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPathTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPositionTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPositionTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java index e0c41a776..27c050af7 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPositionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.FocusContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.FocusContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnQNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnQNameTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java index cb6746e0f..298f6a754 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnQNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.qname; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.qname; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemoveTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemoveTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java index b5b057277..06cd65f81 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemoveTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverseTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java index f72853ac2..959120393 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRootTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRootTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java index b4c06f24c..da1f0531e 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRootTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRoundTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java similarity index 79% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRoundTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java index 5710e8dd2..21adc5711 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRoundTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java index 21233b46a..600d946ea 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.decimal; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java index 03e43ced5..aae461900 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.decimal; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java index 61ccd6d70..25a21b830 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.decimal; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWithTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java similarity index 74% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWithTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java index a1f68a2d1..2e181c36e 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWithTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.string; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -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.util.ObjectUtils; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringJoinTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringJoinTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java index b6a03e654..2d4dd03c0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringJoinTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringLengthTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java similarity index 71% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringLengthTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java index 39c2f30ae..ca52424ea 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringLengthTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java index 9c4956e78..23c9139ff 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStringTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringAfterTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringAfterTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java index a32433da8..98dd4c587 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringAfterTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java index 8a9e6dc8e..3d989c6b5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java similarity index 83% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java index 37d14cf44..61695f5b5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSubstringTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSumTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java similarity index 79% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSumTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java index fd353a3a7..43a275b41 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSumTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.yearMonthDuration; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTailTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTailTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java index 0aab9bf5f..e3315e217 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTailTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java similarity index 71% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java index db3683ef5..6fb09c1f7 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java index 6106aaf7c..f58e8a095 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java similarity index 69% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java index b16256769..701a62245 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dayTimeDuration; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.dayTimeDuration; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTokenizeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java similarity index 87% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTokenizeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java index 911ba7f7d..d38fa48ef 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTokenizeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTrueTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java similarity index 54% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTrueTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java index 166650702..9943a4161 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTrueTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnUpperCaseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java similarity index 72% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnUpperCaseTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java index ae95acfb8..ec2acf064 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnUpperCaseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java index ec2a4e521..042dc2cdc 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java index 95ae0127f..e9c1053a0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java index 639863d69..8aa5a56a6 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnZeroOrOneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnZeroOrOneTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java index 37ed5bf93..d787513fb 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnZeroOrOneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java similarity index 87% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java index a7b2f64d4..0c09beb7a 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -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.INumericItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContainsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java similarity index 77% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContainsTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java index 2217b5346..0a8b11085 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContainsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool; +import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntryTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java similarity index 63% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntryTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java index 5bea47794..a095bdb7e 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntryTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFindTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java similarity index 75% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFindTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java index 2ac1c9424..254f49602 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFindTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapForEachTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java similarity index 65% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapForEachTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java index 6453362ef..1f96271ed 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapForEachTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGetTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java similarity index 69% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGetTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java index 0df719b7d..e19669f97 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGetTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.LookupTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeysTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java similarity index 61% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeysTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java index 684fa8a05..53b4a6294 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeysTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMergeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java similarity index 83% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMergeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java index 7cdd66849..4793c6dca 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMergeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPutTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java similarity index 73% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPutTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java index bbd3b4cf7..86ac28a91 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPutTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemoveTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java similarity index 79% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemoveTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java index a003bd274..0410b9318 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemoveTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSizeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java similarity index 71% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSizeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java index 8ab6d858b..6f5d3b104 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSizeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java similarity index 90% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java rename to core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java index 9d21e9b2f..ee6e535c6 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.function.library; +package dev.metaschema.core.metapath.function.library; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java similarity index 97% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java index 1b9957570..1425b6053 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBooleanItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBooleanItemTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java index b625d71f9..41e2e05cb 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IBooleanItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INumericItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java similarity index 92% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INumericItemTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java index 7784583ed..bb5c631ca 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/INumericItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IStringItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IStringItemTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IStringItemTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/atomic/IStringItemTest.java index 88be592ae..733f1520a 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IStringItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IStringItemTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUuidItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java similarity index 89% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUuidItemTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java index 5cead389a..2ab4467ac 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IUuidItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java similarity index 92% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java index 44a5fcb10..7e95ba0d5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.atomic; +package dev.metaschema.core.metapath.item.atomic; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java similarity index 80% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItemTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java index d081061b4..9a0b8b3b2 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKeyTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java similarity index 85% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKeyTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java index af9bfa43a..da43986a9 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKeyTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.date; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.dateTime; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.time; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.uri; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.uuid; +import static dev.metaschema.core.metapath.TestUtils.date; +import static dev.metaschema.core.metapath.TestUtils.dateTime; +import static dev.metaschema.core.metapath.TestUtils.decimal; +import static dev.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.time; +import static dev.metaschema.core.metapath.TestUtils.uri; +import static dev.metaschema.core.metapath.TestUtils.uuid; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/LookupTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java similarity index 88% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/LookupTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java index fef6d728b..274d7f35b 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/LookupTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.function; +package dev.metaschema.core.metapath.item.function; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence; -import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string; +import static dev.metaschema.core.metapath.TestUtils.array; +import static dev.metaschema.core.metapath.TestUtils.entry; +import static dev.metaschema.core.metapath.TestUtils.integer; +import static dev.metaschema.core.metapath.TestUtils.map; +import static dev.metaschema.core.metapath.TestUtils.sequence; +import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java similarity index 83% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java index 7fd16388d..d53186d23 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleBuilder; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java index 9f0c69da7..71239b393 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java @@ -1,17 +1,17 @@ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeItemTraversalTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeItemTraversalTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java index 691d1f7ff..c206219d7 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/NodeItemTraversalTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMDocumentNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IFieldBuilder; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleBuilder; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.mdm.IDMDocumentNodeItem; +import dev.metaschema.core.mdm.IDMFieldNodeItem; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IFieldBuilder; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java rename to core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java index 05704bcba..494da37cb 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.metapath.item.node; +package dev.metaschema.core.metapath.item.node; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleBuilder; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/CardinalityConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/CardinalityConstraintTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java index 8ccc97861..9859fd9ed 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/CardinalityConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasProperty; @@ -13,17 +13,17 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java similarity index 90% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java index fa8ffaacd..925059d9f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -18,19 +18,19 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.IItemVisitor; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java index 6eb3007c2..c7336f720 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,13 +11,13 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; @@ -268,8 +268,8 @@ private static INodeItem createMockNodeItemWithValue(@NonNull String metapath) { doReturn(true).when(item).hasValue(); // Mock toAtomicItem() to return a proper atomic item - gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem atomicItem - = mock(gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem.class); + dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem atomicItem + = mock(dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem.class); doReturn("test-value").when(atomicItem).asString(); doReturn(atomicItem).when(item).toAtomicItem(); diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExpectConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExpectConstraintTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java index 54e18cfc8..998c346fa 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExpectConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -17,24 +17,24 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.mdm.IDMFieldNodeItem; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java similarity index 78% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java index f47db44db..d566e4023 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleBuilder; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java similarity index 92% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java index 05676b809..8ff0efe34 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,13 +11,13 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/IndexUniqueConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java similarity index 95% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/IndexUniqueConstraintTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java index 3b39935ce..aae40654b 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/IndexUniqueConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasProperty; @@ -13,19 +13,19 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.mdm.IDMFieldNodeItem; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/MatchesConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/MatchesConstraintTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java index 53df14912..8dd6201d2 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/MatchesConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -17,18 +17,18 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfigTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java similarity index 95% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfigTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java index 080a76770..f7ae9b52c 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ParallelValidationConfigTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ReportConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java similarity index 96% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ReportConstraintTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java index 4c16a4a4f..9b7895a34 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/ReportConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint; +package dev.metaschema.core.model.constraint; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -21,20 +21,20 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -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.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Type; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockNodeItemFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint.Type; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java rename to core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java index 2dd88da13..cb31607d5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.constraint.impl; +package dev.metaschema.core.model.constraint.impl; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.ISource; -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.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.testsupport.mocking.MockedDocumentGenerator; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.ISource; +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.model.constraint.IExpectConstraint; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/validation/SchemaContentValidatorTest.java b/core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java similarity index 98% rename from core/src/test/java/gov/nist/secauto/metaschema/core/model/validation/SchemaContentValidatorTest.java rename to core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java index 57d6954d4..0d935e657 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/validation/SchemaContentValidatorTest.java +++ b/core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.model.validation; +package dev.metaschema.core.model.validation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/qname/QNameCacheTest.java b/core/src/test/java/dev/metaschema/core/qname/QNameCacheTest.java similarity index 97% rename from core/src/test/java/gov/nist/secauto/metaschema/core/qname/QNameCacheTest.java rename to core/src/test/java/dev/metaschema/core/qname/QNameCacheTest.java index 146d4db47..2f27cf004 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/qname/QNameCacheTest.java +++ b/core/src/test/java/dev/metaschema/core/qname/QNameCacheTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.qname; +package dev.metaschema.core.qname; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/MockedModelTestSupport.java b/core/src/test/java/dev/metaschema/core/testsupport/MockedModelTestSupport.java similarity index 68% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/MockedModelTestSupport.java rename to core/src/test/java/dev/metaschema/core/testsupport/MockedModelTestSupport.java index f9a91b0c8..bfd5c63a5 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/MockedModelTestSupport.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/MockedModelTestSupport.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport; +package dev.metaschema.core.testsupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleMockFactory; -import gov.nist.secauto.metaschema.core.testsupport.mocking.AbstractMockitoFactory; +import dev.metaschema.core.testsupport.builder.IModuleMockFactory; +import dev.metaschema.core.testsupport.mocking.AbstractMockitoFactory; /** * Provides the ability to generate mocked Metaschema module definitions and diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java index 0d722634f..43f707666 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElement; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelElement; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.AbstractMockitoFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.StringUtils; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.INamedModelElement; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.AbstractMockitoFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.StringUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AbstractModelBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AbstractModelBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java index 151f1c956..f8f136005 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AbstractModelBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AssemblyBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java similarity index 91% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AssemblyBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java index 9dc256fc0..8ba1790e3 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AssemblyBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelElement; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.ModelType; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelElement; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AssemblyReference.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java similarity index 90% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AssemblyReference.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java index 06234fbbd..487dee738 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/AssemblyReference.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ConstraintSetBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ConstraintSetBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java index 839360306..bb9a128bd 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ConstraintSetBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.MetaConstraintSet; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.MetaConstraintSet; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ContextBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java similarity index 81% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ContextBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java index c4639e326..90c8b387a 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ContextBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.MetaConstraintSet; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.model.constraint.MetaConstraintSet; import java.util.ArrayList; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FieldBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FieldBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java index 68e5c34dc..4d580e04f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FieldBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelElement; -import gov.nist.secauto.metaschema.core.model.ModelType; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelElement; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.Map; import java.util.function.Function; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FieldReference.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java similarity index 89% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FieldReference.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java index f29be66ed..fff9925e0 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FieldReference.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FlagBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java similarity index 76% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FlagBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java index 1e6a4af34..b01ba41d3 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/FlagBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelElement; -import gov.nist.secauto.metaschema.core.model.ModelType; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelElement; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IAssemblyBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java similarity index 88% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IAssemblyBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java index 29ba6b6b0..9f0eb5b7b 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IAssemblyBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IConstraintSetBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java similarity index 88% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IConstraintSetBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java index f585fa834..922e47787 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IConstraintSetBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraintSet; import java.util.function.Consumer; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IContextBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IContextBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java index 135a7894a..018085c8e 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IContextBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; +import dev.metaschema.core.model.constraint.IConstraint; import java.util.function.Consumer; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IFieldBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IFieldBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java index 94bde8419..bd048d245 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IFieldBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModule; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IFlagBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IFlagBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java index 88297a9bd..8a7e37e5e 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IFlagBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IMetaschemaBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java similarity index 86% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IMetaschemaBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java index 9c8d4ab47..a3826e633 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IMetaschemaBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModelBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModelBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java index fce22f2a0..429fefee4 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModelBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; import java.util.List; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModelReference.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelReference.java similarity index 90% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModelReference.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IModelReference.java index 04185a716..57eb2b575 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModelReference.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelReference.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java similarity index 91% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java index 21fb46116..bbdb1196a 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleMockFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleMockFactory.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java index 71c9dc1e9..2cbe395f4 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/IModuleMockFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; -import gov.nist.secauto.metaschema.core.testsupport.mocking.IMockFactory; +import dev.metaschema.core.testsupport.mocking.IMockFactory; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ModuleBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ModuleBuilder.java rename to core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java index 93d8de6c7..1a8a31a38 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/builder/ModuleBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.builder; +package dev.metaschema.core.testsupport.builder; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.mocking.AbstractMockitoFactory; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.mocking.AbstractMockitoFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.ArrayList; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/AbstractJMockFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java similarity index 91% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/AbstractJMockFactory.java rename to core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java index d819a4be8..0963179db 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/AbstractJMockFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.mocking; +package dev.metaschema.core.testsupport.mocking; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.jmock.Mockery; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java similarity index 91% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java rename to core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java index 9b8b36122..53c2a1c48 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.mocking; +package dev.metaschema.core.testsupport.mocking; import static org.mockito.Mockito.withSettings; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.mockito.Answers; import org.mockito.Mockito; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/IMockFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/IMockFactory.java similarity index 94% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/IMockFactory.java rename to core/src/test/java/dev/metaschema/core/testsupport/mocking/IMockFactory.java index e406bf2e0..4baff2d59 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/IMockFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/IMockFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.mocking; +package dev.metaschema.core.testsupport.mocking; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/MockNodeItemFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java similarity index 87% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/MockNodeItemFactory.java rename to core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java index dd152eeb5..3b89f9179 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/MockNodeItemFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.mocking; +package dev.metaschema.core.testsupport.mocking; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -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.IFlagNodeItem; -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.metapath.item.node.IRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.NodeItemKind; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +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.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.NodeItemKind; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.util.Collections; @@ -38,7 +38,7 @@ /** * Generates mock node item objects. */ -// FIXME: Integrate with classes in gov.nist.secauto.metaschema.core.testsupport +// FIXME: Integrate with classes in dev.metaschema.core.testsupport @SuppressWarnings("checkstyle:MissingJavadocMethodCheck") @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT") public class MockNodeItemFactory diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java similarity index 82% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java rename to core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java index 7577cf218..c70b4fb7f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.mocking; +package dev.metaschema.core.testsupport.mocking; -import gov.nist.secauto.metaschema.core.mdm.IDMAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMDocumentNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMFieldNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMFlagNodeItem; -import gov.nist.secauto.metaschema.core.mdm.IDMRootAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.mdm.IDMAssemblyNodeItem; +import dev.metaschema.core.mdm.IDMDocumentNodeItem; +import dev.metaschema.core.mdm.IDMFieldNodeItem; +import dev.metaschema.core.mdm.IDMFlagNodeItem; +import dev.metaschema.core.mdm.IDMRootAssemblyNodeItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java b/core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java similarity index 89% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java rename to core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java index 66de0f590..2686d6f91 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.tests; +package dev.metaschema.core.testsupport.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IConstraintSetBuilder; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IConstraintSetBuilder; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ModuleBuilderTest.java b/core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java similarity index 95% rename from core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ModuleBuilderTest.java rename to core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java index 2d6d99fd8..c8da43939 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/testsupport/tests/ModuleBuilderTest.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.testsupport.tests; +package dev.metaschema.core.testsupport.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleBuilder; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/util/MermaidErDiagramGeneratorTest.java b/core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java similarity index 84% rename from core/src/test/java/gov/nist/secauto/metaschema/core/util/MermaidErDiagramGeneratorTest.java rename to core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java index b9499ce6b..d103686dc 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/util/MermaidErDiagramGeneratorTest.java +++ b/core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.util.MermaidErDiagramGenerator; -import gov.nist.secauto.metaschema.core.testsupport.MockedModelTestSupport; -import gov.nist.secauto.metaschema.core.testsupport.builder.IModuleBuilder; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.util.MermaidErDiagramGenerator; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/util/StringUtilsTest.java b/core/src/test/java/dev/metaschema/core/util/StringUtilsTest.java similarity index 93% rename from core/src/test/java/gov/nist/secauto/metaschema/core/util/StringUtilsTest.java rename to core/src/test/java/dev/metaschema/core/util/StringUtilsTest.java index 1acb0d932..3bc336534 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/util/StringUtilsTest.java +++ b/core/src/test/java/dev/metaschema/core/util/StringUtilsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java b/core/src/test/java/dev/metaschema/core/util/UriUtilsTest.java similarity index 99% rename from core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java rename to core/src/test/java/dev/metaschema/core/util/UriUtilsTest.java index 52e365fc8..f3aa6806f 100644 --- a/core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java +++ b/core/src/test/java/dev/metaschema/core/util/UriUtilsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.core.util; +package dev.metaschema.core.util; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/resources/log4j2-test.xml b/core/src/test/resources/log4j2-test.xml index 2999d73e4..8e1c99c72 100644 --- a/core/src/test/resources/log4j2-test.xml +++ b/core/src/test/resources/log4j2-test.xml @@ -10,7 +10,7 @@ - + diff --git a/core/src/test/resources/schema-validation/README.md b/core/src/test/resources/schema-validation/README.md index 3e8893f95..187d2616f 100644 --- a/core/src/test/resources/schema-validation/README.md +++ b/core/src/test/resources/schema-validation/README.md @@ -31,7 +31,7 @@ This directory contains test schemas and instances for validating the schema con ## Usage -These test resources are loaded by the test classes in the `gov.nist.secauto.metaschema.core.model.validation` package: +These test resources are loaded by the test classes in the `dev.metaschema.core.model.validation` package: - `SchemaContentValidatorTest` - Main comprehensive test suite - `ValidationFindingTest` - Tests for individual validation finding classes diff --git a/databind-modules/.settings/org.eclipse.jdt.apt.core.prefs b/databind-modules/.settings/org.eclipse.jdt.apt.core.prefs index 775dae91e..eb9e0b308 100644 --- a/databind-modules/.settings/org.eclipse.jdt.apt.core.prefs +++ b/databind-modules/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false -org.eclipse.jdt.apt.reconcileEnabled=false +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/databind-modules/.settings/org.eclipse.jdt.core.prefs b/databind-modules/.settings/org.eclipse.jdt.core.prefs index d5c6a182f..3d703be57 100644 --- a/databind-modules/.settings/org.eclipse.jdt.core.prefs +++ b/databind-modules/.settings/org.eclipse.jdt.core.prefs @@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false diff --git a/databind-modules/pom.xml b/databind-modules/pom.xml index cbf0040c2..1adf5e5d6 100644 --- a/databind-modules/pom.xml +++ b/databind-modules/pom.xml @@ -84,7 +84,7 @@ maven-checkstyle-plugin - **/gov/nist/secauto/metaschema/metaschema/model/**/* + **/dev/metaschema/metaschema/model/**/* diff --git a/databind-modules/src/main/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandler.java b/databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java similarity index 93% rename from databind-modules/src/main/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandler.java rename to databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java index 64879b2e6..ed14c69fb 100644 --- a/databind-modules/src/main/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandler.java +++ b/databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.modules.sarif; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationFinding; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.UriUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.SerializationFeature; +package dev.metaschema.modules.sarif; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.SerializationFeature; import org.schemastore.json.sarif.x210.Artifact; import org.schemastore.json.sarif.x210.ArtifactLocation; diff --git a/databind-modules/src/main/java/module-info.java b/databind-modules/src/main/java/module-info.java index 60707f9ba..809ac8536 100644 --- a/databind-modules/src/main/java/module-info.java +++ b/databind-modules/src/main/java/module-info.java @@ -7,20 +7,20 @@ * Provides Metaschema module bindings and validation handlers including SARIF * output support. */ -module gov.nist.secauto.metaschema.databind.modules { +module dev.metaschema.databind.modules { // requirements requires java.base; - requires transitive gov.nist.secauto.metaschema.core; - requires transitive gov.nist.secauto.metaschema.databind; - requires transitive gov.nist.secauto.metaschema.schemagen; + requires transitive dev.metaschema.core; + requires transitive dev.metaschema.databind; + requires transitive dev.metaschema.schemagen; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; requires json.schema; - exports gov.nist.secauto.metaschema.modules.sarif; + exports dev.metaschema.modules.sarif; // open generated binding classes for reflection opens org.schemastore.json.sarif.x210; diff --git a/databind-modules/src/test/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandlerTest.java b/databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java similarity index 93% rename from databind-modules/src/test/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandlerTest.java rename to databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java index cd623d4f4..e583f5bb2 100644 --- a/databind-modules/src/test/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandlerTest.java +++ b/databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.modules.sarif; +package dev.metaschema.modules.sarif; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationFinding; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/README.md b/databind/README.md index 8cf57a89a..4776e6736 100644 --- a/databind/README.md +++ b/databind/README.md @@ -14,7 +14,7 @@ git submodule update --init --recursive ### Config Binding Classes -Package: `gov.nist.secauto.metaschema.databind.config.binding` +Package: `dev.metaschema.databind.config.binding` These classes are generated from the binding configuration schema (`src/main/metaschema/metaschema-bindings.yaml`) and are used to parse binding configuration files. @@ -33,7 +33,7 @@ mvn install -PCI -Prelease ### Model Binding Classes -Package: `gov.nist.secauto.metaschema.databind.model.metaschema.binding` +Package: `dev.metaschema.databind.model.metaschema.binding` These classes are generated from the core Metaschema module (`core/metaschema/schema/metaschema/metaschema-module-metaschema.xml`) and are used for parsing Metaschema module definitions. @@ -64,7 +64,7 @@ Customizes the generated config binding classes. Customizes the generated model binding classes: -- Maps the Metaschema namespace to `gov.nist.secauto.metaschema.databind.model.metaschema.binding` +- Maps the Metaschema namespace to `dev.metaschema.databind.model.metaschema.binding` - Renames `group-as` to `GroupingAs` (avoids Java keyword conflict) - Adds interface implementations to constraint classes (e.g., `IModelConstraintsBase`) - Adds interface implementations to inline definitions for typed collections diff --git a/databind/pom-bootstrap-config.xml b/databind/pom-bootstrap-config.xml index e3ffc09cb..3f21b5c36 100644 --- a/databind/pom-bootstrap-config.xml +++ b/databind/pom-bootstrap-config.xml @@ -24,7 +24,7 @@ Standalone POM for regenerating metaschema-bindings binding classes. - ${project.basedir}/src/main/java/gov/nist/secauto/metaschema/databind/config/binding + ${project.basedir}/src/main/java/dev/metaschema/databind/config/binding ${project.build.directory}/metaschema @@ -102,7 +102,7 @@

        cc0-dedication.txt
        - src/main/java/gov/nist/secauto/metaschema/databind/config/binding/**/*.java + src/main/java/dev/metaschema/databind/config/binding/**/*.java @@ -122,7 +122,7 @@ - src/main/java/gov/nist/secauto/metaschema/databind/config/binding/**/*.java + src/main/java/dev/metaschema/databind/config/binding/**/*.java diff --git a/databind/pom-bootstrap-model.xml b/databind/pom-bootstrap-model.xml index 5d2313b95..7a1b38ace 100644 --- a/databind/pom-bootstrap-model.xml +++ b/databind/pom-bootstrap-model.xml @@ -25,7 +25,7 @@ Standalone POM for regenerating Metaschema model binding classes. - ${project.basedir}/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding + ${project.basedir}/src/main/java/dev/metaschema/databind/model/metaschema/binding ${project.build.directory}/metaschema ${project.basedir}/../core/metaschema/schema/metaschema @@ -107,7 +107,7 @@
        cc0-dedication.txt
        - src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/**/*.java + src/main/java/dev/metaschema/databind/model/metaschema/binding/**/*.java         @@ -127,7 +127,7 @@ - src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/**/*.java + src/main/java/dev/metaschema/databind/model/metaschema/binding/**/*.java diff --git a/databind/pom.xml b/databind/pom.xml index 4faa3b81c..af0029090 100644 --- a/databind/pom.xml +++ b/databind/pom.xml @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - **/gov/nist/secauto/metaschema/databind/model/metaschema/binding/*.java,**/gov/nist/secauto/metaschema/databind/model/test/*.java,**/gov/nist/secauto/metaschema/databind/config/binding/*.java + **/dev/metaschema/databind/model/metaschema/binding/*.java,**/dev/metaschema/databind/model/test/*.java,**/dev/metaschema/databind/config/binding/*.java @@ -125,8 +125,8 @@ - gov/nist/secauto/metaschema/databind/model/binding/metaschema/* - gov/nist/secauto/metaschema/databind/config/binding/* + dev/metaschema/databind/model/binding/metaschema/* + dev/metaschema/databind/config/binding/* diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/AbstractModuleLoaderStrategy.java b/databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/AbstractModuleLoaderStrategy.java rename to databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java index 407442734..610506805 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/AbstractModuleLoaderStrategy.java +++ b/databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ExceptionUtils; -import gov.nist.secauto.metaschema.core.util.ExceptionUtils.WrappedException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext.IBindingMatcher; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.impl.DefinitionAssembly; -import gov.nist.secauto.metaschema.databind.model.impl.DefinitionField; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.DefaultConstraintValidator; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ExceptionUtils; +import dev.metaschema.core.util.ExceptionUtils.WrappedException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext.IBindingMatcher; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.impl.DefinitionAssembly; +import dev.metaschema.databind.model.impl.DefinitionField; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java b/databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java rename to databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java index 21d3dcb51..d7f7c701b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java @@ -3,30 +3,30 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -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.metaschema.databind.io.json.DefaultJsonDeserializer; -import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonSerializer; -import gov.nist.secauto.metaschema.databind.io.xml.DefaultXmlDeserializer; -import gov.nist.secauto.metaschema.databind.io.xml.DefaultXmlSerializer; -import gov.nist.secauto.metaschema.databind.io.yaml.DefaultYamlDeserializer; -import gov.nist.secauto.metaschema.databind.io.yaml.DefaultYamlSerializer; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.ModuleLoadingPostProcessor; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.io.json.DefaultJsonDeserializer; +import dev.metaschema.databind.io.json.DefaultJsonSerializer; +import dev.metaschema.databind.io.xml.DefaultXmlDeserializer; +import dev.metaschema.databind.io.xml.DefaultXmlSerializer; +import dev.metaschema.databind.io.yaml.DefaultYamlDeserializer; +import dev.metaschema.databind.io.yaml.DefaultYamlSerializer; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.metaschema.BindingModuleLoader; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.ModuleLoadingPostProcessor; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; import java.io.IOException; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java b/databind/src/main/java/dev/metaschema/databind/IBindingContext.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java rename to databind/src/main/java/dev/metaschema/databind/IBindingContext.java index dcd5ff44e..42d007f46 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/IBindingContext.java @@ -3,54 +3,54 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.datatype.DataTypeService; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -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.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.IModuleLoader; -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.DefaultConstraintValidator; -import gov.nist.secauto.metaschema.core.model.constraint.ExternalConstraintsModulePostProcessor; -import gov.nist.secauto.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidator; -import gov.nist.secauto.metaschema.core.model.constraint.ParallelValidationConfig; -import gov.nist.secauto.metaschema.core.model.constraint.ValidationFeature; -import gov.nist.secauto.metaschema.core.model.validation.AggregateValidationResult; -import gov.nist.secauto.metaschema.core.model.validation.IValidationResult; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.DefaultModuleBindingGenerator; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.io.DefaultBoundLoader; -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.IDeserializer; -import gov.nist.secauto.metaschema.databind.io.ISerializer; -import gov.nist.secauto.metaschema.databind.io.yaml.YamlOperations; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -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.metaschema.databind.model.metaschema.ModuleLoadingPostProcessor; +package dev.metaschema.databind; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.datatype.DataTypeService; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModuleLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.DefaultConstraintValidator; +import dev.metaschema.core.model.constraint.ExternalConstraintsModulePostProcessor; +import dev.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.IConstraintValidationHandler; +import dev.metaschema.core.model.constraint.IConstraintValidator; +import dev.metaschema.core.model.constraint.ParallelValidationConfig; +import dev.metaschema.core.model.constraint.ValidationFeature; +import dev.metaschema.core.model.validation.AggregateValidationResult; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.DefaultModuleBindingGenerator; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.DefaultBoundLoader; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.IDeserializer; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.io.yaml.YamlOperations; +import dev.metaschema.databind.model.IBoundDefinitionModel; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.ModuleLoadingPostProcessor; import org.eclipse.jdt.annotation.Owning; import org.json.JSONObject; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java b/databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java rename to databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java index e9502fecf..0d98ba444 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java +++ b/databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.IModuleLoader; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.databind.IBindingContext.IBindingMatcher; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +package dev.metaschema.databind; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModuleLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.databind.IBindingContext.IBindingMatcher; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundModule; import java.util.ArrayList; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java b/databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java rename to databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java index 9860a3941..073341d4a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java +++ b/databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext.IBindingMatcher; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext.IBindingMatcher; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import javax.xml.namespace.QName; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java b/databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java rename to databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java index 0819b3c0c..f34f13686 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java +++ b/databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.databind.codegen.IModuleBindingGenerator; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.databind.codegen.IModuleBindingGenerator; +import dev.metaschema.databind.model.IBoundModule; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java b/databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java similarity index 98% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java rename to databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java index af6f6fe04..5e607f680 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/DefaultModuleBindingGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/DefaultModuleBindingGenerator.java rename to databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java index 296c8a208..42f0b8462 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/DefaultModuleBindingGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundModule; import java.io.IOException; import java.nio.file.Path; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedClass.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedClass.java rename to databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedClass.java index 6851681d7..89d3bdaea 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedClass.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import com.squareup.javapoet.ClassName; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java rename to databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java index 4af52f9cc..9ea03e3d2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelDefinition; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedModuleClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedModuleClass.java rename to databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java index 4e5c528e2..ee7dfaefa 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedModuleClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundModule; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IModuleBindingGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IModuleBindingGenerator.java rename to databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java index 67c74fe92..9956ee742 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IModuleBindingGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.databind.model.IBoundModule; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IPackageProduction.java b/databind/src/main/java/dev/metaschema/databind/codegen/IPackageProduction.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IPackageProduction.java rename to databind/src/main/java/dev/metaschema/databind/codegen/IPackageProduction.java index a329656d8..cce085c5e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IPackageProduction.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IPackageProduction.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IProduction.java b/databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IProduction.java rename to databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java index 55e65b558..cd6e1c320 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IProduction.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import java.io.IOException; import java.nio.file.Path; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaCompilerSupport.java b/databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java similarity index 98% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaCompilerSupport.java rename to databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java index 139c37d58..cfe6c8121 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaCompilerSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.io.IOException; import java.io.StringWriter; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java rename to databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java index 6720a7eb9..5e8404e5e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java b/databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java rename to databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java index fe6bb627e..9d68560fd 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageMetadata.java b/databind/src/main/java/dev/metaschema/databind/codegen/PackageMetadata.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageMetadata.java rename to databind/src/main/java/dev/metaschema/databind/codegen/PackageMetadata.java index 02305c5d9..e8e437fb0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageMetadata.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/PackageMetadata.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import java.net.URI; import java.util.LinkedList; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java index 5d6789e7a..de9559cc1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; +import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; import java.io.IOException; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ProductionImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ProductionImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java index 4668dbf44..9e77c909b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ProductionImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; import java.io.IOException; import java.nio.file.Path; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java index a11d0e211..f60e0700a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; - -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.ClassUtils; -import gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IDeserializer; +package dev.metaschema.databind.codegen.config; + +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.ClassUtils; +import dev.metaschema.databind.config.binding.MetaschemaBindings; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java index adecf115f..945e1307c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; -import gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings; +import dev.metaschema.databind.config.binding.MetaschemaBindings; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java index 33b0de194..0b0cde2e9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultPropertyBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultPropertyBindingConfiguration.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultPropertyBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultPropertyBindingConfiguration.java index c24d37d59..eeb885e53 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultPropertyBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultPropertyBindingConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java index 1a20f58c9..e18d4eee8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IChoiceGroupBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IChoiceGroupBindingConfiguration.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IChoiceGroupBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/IChoiceGroupBindingConfiguration.java index cc367142e..86a217e0e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IChoiceGroupBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IChoiceGroupBindingConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java index 506218e4b..71d8ace02 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import java.util.List; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IMutableDefinitionBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IMutableDefinitionBindingConfiguration.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IMutableDefinitionBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/IMutableDefinitionBindingConfiguration.java index 7bc753f76..8bdab971f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IMutableDefinitionBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IMutableDefinitionBindingConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IMutablePropertyBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IMutablePropertyBindingConfiguration.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IMutablePropertyBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/IMutablePropertyBindingConfiguration.java index 279b2a18d..38d9fdbde 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IMutablePropertyBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IMutablePropertyBindingConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IPropertyBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IPropertyBindingConfiguration.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IPropertyBindingConfiguration.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/IPropertyBindingConfiguration.java index 5961cd496..934799d8b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IPropertyBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IPropertyBindingConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/package-info.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/package-info.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/package-info.java rename to databind/src/main/java/dev/metaschema/databind/codegen/config/package-info.java index f4819e687..16e8b2501 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/package-info.java @@ -8,4 +8,4 @@ * Module modules. */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java rename to databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java index 361a8cfeb..143788b8d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java @@ -3,51 +3,51 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.impl; +package dev.metaschema.databind.codegen.impl; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.AnnotationSpec.Builder; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -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.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IReportConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.annotations.Expect; -import gov.nist.secauto.metaschema.databind.model.annotations.HasCardinality; -import gov.nist.secauto.metaschema.databind.model.annotations.Index; -import gov.nist.secauto.metaschema.databind.model.annotations.IndexHasKey; -import gov.nist.secauto.metaschema.databind.model.annotations.IsUnique; -import gov.nist.secauto.metaschema.databind.model.annotations.KeyField; -import gov.nist.secauto.metaschema.databind.model.annotations.Let; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.Report; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IReportConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.AssemblyConstraints; +import dev.metaschema.databind.model.annotations.Expect; +import dev.metaschema.databind.model.annotations.HasCardinality; +import dev.metaschema.databind.model.annotations.Index; +import dev.metaschema.databind.model.annotations.IndexHasKey; +import dev.metaschema.databind.model.annotations.IsUnique; +import dev.metaschema.databind.model.annotations.KeyField; +import dev.metaschema.databind.model.annotations.Let; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.Report; +import dev.metaschema.databind.model.annotations.ValueConstraints; import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedClass.java rename to databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java index a5f3f7a47..e06173cd5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.impl; +package dev.metaschema.databind.codegen.impl; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedClass; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.IGeneratedClass; import java.nio.file.Path; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java rename to databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java index e49f8ef03..30dbee6d3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.impl; +package dev.metaschema.databind.codegen.impl; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedDefinitionClass; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; import java.nio.file.Path; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java rename to databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java index d51b430f5..093f8e297 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.impl; +package dev.metaschema.databind.codegen.impl; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedDefinitionClass; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedModuleClass; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; +import dev.metaschema.databind.codegen.IGeneratedModuleClass; import java.nio.file.Path; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/package-info.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/package-info.java similarity index 64% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/package-info.java rename to databind/src/main/java/dev/metaschema/databind/codegen/impl/package-info.java index 07425c9f0..62587e1ae 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/package-info.java @@ -10,8 +10,8 @@ * source files, including module classes, definition classes, and supporting * utilities for annotation generation. * - * @see gov.nist.secauto.metaschema.databind.codegen.IGeneratedClass - * @see gov.nist.secauto.metaschema.databind.codegen.IGeneratedModuleClass + * @see dev.metaschema.databind.codegen.IGeneratedClass + * @see dev.metaschema.databind.codegen.IGeneratedModuleClass */ -package gov.nist.secauto.metaschema.databind.codegen.impl; +package dev.metaschema.databind.codegen.impl; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/package-info.java b/databind/src/main/java/dev/metaschema/databind/codegen/package-info.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/package-info.java rename to databind/src/main/java/dev/metaschema/databind/codegen/package-info.java index 10e5fca32..9212eccec 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/package-info.java @@ -7,4 +7,4 @@ * Support for generating "plain old Java objects" (POJOs) based on a Module. */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java index 7bb93755b..e8c7f5936 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java similarity index 74% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java index 09d9a55c1..b48718d3e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IInstance; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.core.model.IInstance; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java index 7676397c8..17d4abee5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -12,14 +12,14 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IGroupable; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.GroupAs; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java index efefb5e35..2e80dcd6f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.FieldSpec; @@ -12,18 +12,18 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IGroupable; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.ClassUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoice; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.ClassUtils; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.BoundChoice; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java index 8a7cc1992..b5bcc36db 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -13,11 +13,11 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java index 760705520..404f82656 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.ClassUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.ClassUtils; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java index 0fa62fcc8..c0f260e62 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.BoundAssembly; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java index f91501bdd..34dcf22d7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -14,18 +14,18 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.WildcardTypeName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IGroupable; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; +import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java index 1919a6b1c..c89e30e40 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -14,39 +14,39 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.WildcardTypeName; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.UriUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedClass; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedDefinitionClass; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedModuleClass; -import gov.nist.secauto.metaschema.databind.codegen.impl.AnnotationGenerator; -import gov.nist.secauto.metaschema.databind.codegen.impl.DefaultGeneratedClass; -import gov.nist.secauto.metaschema.databind.codegen.impl.DefaultGeneratedDefinitionClass; -import gov.nist.secauto.metaschema.databind.codegen.impl.DefaultGeneratedModuleClass; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaPackage; -import gov.nist.secauto.metaschema.databind.model.annotations.NsBinding; -import gov.nist.secauto.metaschema.databind.model.annotations.XmlNs; -import gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm; -import gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.IGeneratedClass; +import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; +import dev.metaschema.databind.codegen.IGeneratedModuleClass; +import dev.metaschema.databind.codegen.impl.AnnotationGenerator; +import dev.metaschema.databind.codegen.impl.DefaultGeneratedClass; +import dev.metaschema.databind.codegen.impl.DefaultGeneratedDefinitionClass; +import dev.metaschema.databind.codegen.impl.DefaultGeneratedModuleClass; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.databind.model.annotations.MetaschemaPackage; +import dev.metaschema.databind.model.annotations.NsBinding; +import dev.metaschema.databind.model.annotations.XmlNs; +import dev.metaschema.databind.model.annotations.XmlNsForm; +import dev.metaschema.databind.model.annotations.XmlSchema; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java index 47ff96949..e3ce62482 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.ClassUtils; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.ClassUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; +import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java index 29d4ebbbf..6d5654b10 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -11,15 +11,15 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.impl.AnnotationGenerator; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.impl.AnnotationGenerator; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.BoundField; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java index d69c85be2..4a808d7d3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -12,12 +12,12 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.BoundFieldValue; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java index 8f5c8cd9e..2089fb548 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; @@ -11,20 +11,20 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.impl.AnnotationGenerator; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.impl.AnnotationGenerator; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; +import dev.metaschema.databind.model.annotations.JsonKey; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java index 0cd6e2226..b46ff4016 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; import java.lang.annotation.Annotation; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java index a396a508d..663b746bc 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedField; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.databind.model.annotations.BoundGroupedField; import java.lang.annotation.Annotation; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IAssemblyInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IAssemblyInstanceTypeInfo.java similarity index 61% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IAssemblyInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IAssemblyInstanceTypeInfo.java index 7f174d359..c09c286b3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IAssemblyInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IAssemblyInstanceTypeInfo.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; public interface IAssemblyInstanceTypeInfo extends INamedModelInstanceTypeInfo { @Override diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IChoiceGroupTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IChoiceGroupTypeInfo.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IChoiceGroupTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IChoiceGroupTypeInfo.java index d867396b3..ad7f07b6d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IChoiceGroupTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IChoiceGroupTypeInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; public interface IChoiceGroupTypeInfo extends IModelInstanceTypeInfo { // no other methods diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFieldInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldInstanceTypeInfo.java similarity index 61% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFieldInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldInstanceTypeInfo.java index b9e8b3249..a11effb49 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFieldInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldInstanceTypeInfo.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFieldInstanceAbsolute; public interface IFieldInstanceTypeInfo extends INamedModelInstanceTypeInfo { @Override diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java index 1dbbbf9d5..52542dcb4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java index e6cb61028..f84f76426 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedAssemblyInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedAssemblyInstanceTypeInfo.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedAssemblyInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedAssemblyInstanceTypeInfo.java index 1e1f1062c..9bff5a6ea 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedAssemblyInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedAssemblyInstanceTypeInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; @FunctionalInterface public interface IGroupedAssemblyInstanceTypeInfo extends IGroupedNamedModelInstanceTypeInfo { diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedFieldInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedFieldInstanceTypeInfo.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedFieldInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedFieldInstanceTypeInfo.java index a76e90d16..7f1e389d1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedFieldInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedFieldInstanceTypeInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; @FunctionalInterface public interface IGroupedFieldInstanceTypeInfo extends IGroupedNamedModelInstanceTypeInfo { diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java index c533837a1..257a512ce 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelDefinition; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java index 6227b2dbc..f0c45a831 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java index 69c31b7b6..99ef98ea1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedClass; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedDefinitionClass; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedModuleClass; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.codegen.IGeneratedClass; +import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; +import dev.metaschema.databind.codegen.IGeneratedModuleClass; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import java.io.IOException; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java index 08aaf4d45..a2b2b3b3c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java index b19a542e7..59080539e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.MethodSpec; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.INamedInstance; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.INamedInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java index 3d965db5a..8e37aa8b4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.MethodSpec; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java index 94e4063fa..7a3b6dabe 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelDefinition; import java.util.Set; @@ -22,8 +22,8 @@ public interface IPropertyTypeInfo extends ITypeInfo { * *

        * For flags, this checks - * {@link gov.nist.secauto.metaschema.core.model.IFlagInstance#isRequired()}. - * For model instances, this is based on minimum occurrence constraints. + * {@link dev.metaschema.core.model.IFlagInstance#isRequired()}. For model + * instances, this is based on minimum occurrence constraints. * *

        * Choice blocks: Properties inside Metaschema choice blocks diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java index 2c46afb42..a942ad705 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.TypeName; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java index 00d52cb1e..054eb3524 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java similarity index 89% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java index dab0691e7..d717f5d94 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import com.squareup.javapoet.AnnotationSpec; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.INamedModelInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java index ebcb25ab4..aff484e9d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.FlagInstanceTypeInfoImpl; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.FlagInstanceTypeInfoImpl; +import dev.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java index ae89c05a3..a52e06196 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; - -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IModelInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.INamedModelInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +package dev.metaschema.databind.codegen.typeinfo.def; + +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IModelInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.INamedModelInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java index 704833bd7..eb3f73808 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IInstance; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFieldValueTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IInstance; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.IFieldValueTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java index c6dee10ea..20b64f6ad 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java index fee78b228..b9399d63d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IInstance; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IInstance; +import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java index ef77ed13d..f97b652f1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java index d23aff668..22df775d0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import java.util.Collection; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/package-info.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/package-info.java similarity index 61% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/package-info.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/package-info.java index e88dd3d6d..b4bb4217e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/package-info.java @@ -11,8 +11,8 @@ * type information for Metaschema assembly and field definitions, enabling the * generation of corresponding Java classes. * - * @see gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo - * @see gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo + * @see dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo + * @see dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo.def; +package dev.metaschema.databind.codegen.typeinfo.def; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/package-info.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/package-info.java similarity index 63% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/package-info.java rename to databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/package-info.java index cb598bf17..8f7f78ab0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/package-info.java @@ -11,8 +11,8 @@ * representing Java type information for Metaschema definitions and instances, * including flags, fields, assemblies, and choice groups. * - * @see gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver - * @see gov.nist.secauto.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory + * @see dev.metaschema.databind.codegen.typeinfo.ITypeResolver + * @see dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/MetaschemaBindings.java b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/MetaschemaBindings.java rename to databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java index 5297496b2..7d2bc8772 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/MetaschemaBindings.java +++ b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java @@ -2,29 +2,29 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/metaschema-bindings.yaml +// Generated from: ../../../../../../metaschema/metaschema-bindings.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.config.binding; - +package dev.metaschema.databind.config.binding; + +import dev.metaschema.core.datatype.adapter.BooleanAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.BooleanAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; import java.net.URI; import java.util.LinkedList; import java.util.List; @@ -68,8 +68,8 @@ public class MetaschemaBindings implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings} - * instance with no metadata. + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings} instance + * with no metadata. */ public MetaschemaBindings() { this(null); @@ -77,8 +77,8 @@ public MetaschemaBindings() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings} - * instance with the specified metadata. + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none @@ -248,7 +248,7 @@ public static class ModelBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding} * instance with no metadata. */ public ModelBinding() { @@ -257,7 +257,7 @@ public ModelBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding} * instance with the specified metadata. * * @param data @@ -354,7 +354,7 @@ public static class Java implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding.Java} * instance with no metadata. */ public Java() { @@ -363,7 +363,7 @@ public Java() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.ModelBinding.Java} * instance with the specified metadata. * * @param data @@ -460,7 +460,7 @@ public static class MetaschemaBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding} * instance with no metadata. */ public MetaschemaBinding() { @@ -469,7 +469,7 @@ public MetaschemaBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding} * instance with the specified metadata. * * @param data @@ -701,7 +701,7 @@ public static class DefineAssemblyBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding} * instance with no metadata. */ public DefineAssemblyBinding() { @@ -710,7 +710,7 @@ public DefineAssemblyBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding} * instance with the specified metadata. * * @param data @@ -980,7 +980,7 @@ public static class Java implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.Java} * instance with no metadata. */ public Java() { @@ -989,7 +989,7 @@ public Java() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.Java} * instance with the specified metadata. * * @param data @@ -1179,7 +1179,7 @@ public static class PropertyBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding} * instance with no metadata. */ public PropertyBinding() { @@ -1188,7 +1188,7 @@ public PropertyBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding} * instance with the specified metadata. * * @param data @@ -1283,7 +1283,7 @@ public static class Java implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding.Java} * instance with no metadata. */ public Java() { @@ -1292,7 +1292,7 @@ public Java() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.PropertyBinding.Java} * instance with the specified metadata. * * @param data @@ -1374,7 +1374,7 @@ public static class ChoiceGroupBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding} * instance with no metadata. */ public ChoiceGroupBinding() { @@ -1383,7 +1383,7 @@ public ChoiceGroupBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding} * instance with the specified metadata. * * @param data @@ -1491,7 +1491,7 @@ public static class ItemType implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding.ItemType} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding.ItemType} * instance with no metadata. */ public ItemType() { @@ -1500,7 +1500,7 @@ public ItemType() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding.ItemType} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineAssemblyBinding.ChoiceGroupBinding.ItemType} * instance with the specified metadata. * * @param data @@ -1626,7 +1626,7 @@ public static class DefineFieldBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding} * instance with no metadata. */ public DefineFieldBinding() { @@ -1635,7 +1635,7 @@ public DefineFieldBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding} * instance with the specified metadata. * * @param data @@ -1848,7 +1848,7 @@ public static class Java implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.Java} * instance with no metadata. */ public Java() { @@ -1857,7 +1857,7 @@ public Java() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.Java} * instance with the specified metadata. * * @param data @@ -2047,7 +2047,7 @@ public static class PropertyBinding implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding} * instance with no metadata. */ public PropertyBinding() { @@ -2056,7 +2056,7 @@ public PropertyBinding() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding} * instance with the specified metadata. * * @param data @@ -2151,7 +2151,7 @@ public static class Java implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding.Java} * instance with no metadata. */ public Java() { @@ -2160,7 +2160,7 @@ public Java() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding.Java} + * {@code dev.metaschema.databind.config.binding.MetaschemaBindings.MetaschemaBinding.DefineFieldBinding.PropertyBinding.Java} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/MetaschemaBindingsModule.java b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/MetaschemaBindingsModule.java rename to databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java index 701b02b2c..a9eb2cf51 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/MetaschemaBindingsModule.java +++ b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java @@ -2,17 +2,17 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/metaschema-bindings.yaml +// Generated from: ../../../../../../metaschema/metaschema-bindings.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.config.binding; +package dev.metaschema.databind.config.binding; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaModule; import java.net.URI; import java.util.List; diff --git a/databind/src/main/java/dev/metaschema/databind/config/binding/package-info.java b/databind/src/main/java/dev/metaschema/databind/config/binding/package-info.java new file mode 100644 index 000000000..491842d15 --- /dev/null +++ b/databind/src/main/java/dev/metaschema/databind/config/binding/package-info.java @@ -0,0 +1,26 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ +// Generated from: ../../../../../../metaschema/metaschema-bindings.yaml +// Do not edit - changes will be lost when regenerated. +/** + * Provides generated Metaschema binding classes for module(s): Metaschema + * Binding Configuration. + *

        + * version 1.0.0 + *

        + * This module defines the binding configuration format used to customize Java + * code generation from Metaschema modules. It allows specifying package names, + * class names, interface implementations, base classes, and collection types + * for generated binding classes. + *

        + */ + +@dev.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { + dev.metaschema.databind.config.binding.MetaschemaBindingsModule.class }) +@dev.metaschema.databind.model.annotations.XmlSchema(namespace = "https://csrc.nist.gov/ns/metaschema-binding/1.0", + xmlns = { @dev.metaschema.databind.model.annotations.XmlNs(prefix = "", + namespace = "https://csrc.nist.gov/ns/metaschema-binding/1.0") }, + xmlElementFormDefault = dev.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED) +package dev.metaschema.databind.config.binding; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java rename to databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java index 91a96e920..8bbde2c05 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -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.IBoundObject; -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.IConstraintValidationHandler; -import gov.nist.secauto.metaschema.core.model.constraint.LoggingConstraintValidationHandler; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +package dev.metaschema.databind.io; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.DefaultConstraintValidator; +import dev.metaschema.core.model.constraint.IConstraintValidationHandler; +import dev.metaschema.core.model.constraint.LoggingConstraintValidationHandler; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import java.io.IOException; import java.io.Reader; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java index 5a728e57c..0143266c7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; - -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; +package dev.metaschema.databind.io; + +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundProperty; import java.io.IOException; import java.util.ArrayList; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializationBase.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializationBase.java rename to databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java index 633d1ec17..ad1d37cc0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializationBase.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfigurationFeature; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfigurationFeature; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java rename to databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java index 481b7edd6..ca96e01a6 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java b/databind/src/main/java/dev/metaschema/databind/io/BindingException.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java rename to databind/src/main/java/dev/metaschema/databind/io/BindingException.java index aaedbab5b..4a15a66f3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java +++ b/databind/src/main/java/dev/metaschema/databind/io/BindingException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; /** * Used to report exceptional conditions related to processing bound objects. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java b/databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java rename to databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java index 8a6311ba9..9f04e09c4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; - -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractResourceResolver; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.ModelDetector.Result; +package dev.metaschema.databind.io; + +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.AbstractResourceResolver; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.ModelDetector.Result; import org.eclipse.jdt.annotation.NotOwning; import org.eclipse.jdt.annotation.Owning; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DeserializationFeature.java b/databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DeserializationFeature.java rename to databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java index 3ef7e5ac2..cb268c83d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DeserializationFeature.java +++ b/databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.configuration.AbstractConfigurationFeature; +import dev.metaschema.core.model.IAssemblyDefinition; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java b/databind/src/main/java/dev/metaschema/databind/io/Format.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java rename to databind/src/main/java/dev/metaschema/databind/io/Format.java index 945ca0400..e519f09ff 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java +++ b/databind/src/main/java/dev/metaschema/databind/io/Format.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.format.PathFormatSelection; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.PathFormatSelection; +import dev.metaschema.core.util.CollectionUtil; import java.util.Arrays; import java.util.HashSet; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/FormatDetector.java b/databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/FormatDetector.java rename to databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java index e2da4dc91..dab795760 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/FormatDetector.java +++ b/databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.format.DataFormatDetector; @@ -12,11 +12,11 @@ import com.fasterxml.jackson.dataformat.xml.XmlFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.json.JsonFactoryFactory; -import gov.nist.secauto.metaschema.databind.io.yaml.impl.YamlFactoryFactory; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.json.JsonFactoryFactory; +import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; import java.io.IOException; import java.io.InputStream; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java b/databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java rename to databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java index 2c4f6fc22..c5df9a6e9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.metapath.IDocumentLoader; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -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; +package dev.metaschema.databind.io; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.IDocumentLoader; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; import org.eclipse.jdt.annotation.Owning; import org.xml.sax.InputSource; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializationHandler.java b/databind/src/main/java/dev/metaschema/databind/io/IDeserializationHandler.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializationHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/IDeserializationHandler.java index e699ee950..d3947d55a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializationHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IDeserializationHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; /** * Provides methods used during deserialization to perform additional actions diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java rename to databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java index b01baabf5..6b85bd560 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.databind.io; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.constraint.IConstraintValidationHandler; +import dev.metaschema.core.util.ObjectUtils; import java.io.File; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java b/databind/src/main/java/dev/metaschema/databind/io/IParsingContext.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java rename to databind/src/main/java/dev/metaschema/databind/io/IParsingContext.java index f919ba211..77773c3b4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IParsingContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import org.eclipse.jdt.annotation.NotOwning; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java index f363fe157..c5b7619e4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundProperty; import java.io.IOException; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java b/databind/src/main/java/dev/metaschema/databind/io/ISerializer.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java rename to databind/src/main/java/dev/metaschema/databind/io/ISerializer.java index 32eade6b3..d1499c33a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/ISerializer.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; import java.io.File; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java b/databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java rename to databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java index 7e24c215a..a383fb17e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java b/databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java rename to databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java index f0292953a..051fb284b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java +++ b/databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import com.ctc.wstx.stax.WstxInputFactory; import com.fasterxml.jackson.core.JsonParser; @@ -11,15 +11,15 @@ import com.fasterxml.jackson.core.io.MergedStream; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.json.JsonFactoryFactory; -import gov.nist.secauto.metaschema.databind.io.yaml.impl.YamlFactoryFactory; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.json.JsonFactoryFactory; +import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLInputFactory2; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/PathTracker.java b/databind/src/main/java/dev/metaschema/databind/io/PathTracker.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/PathTracker.java rename to databind/src/main/java/dev/metaschema/databind/io/PathTracker.java index 86ddd2269..54561ad2b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/PathTracker.java +++ b/databind/src/main/java/dev/metaschema/databind/io/PathTracker.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayDeque; import java.util.Deque; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/SerializationFeature.java b/databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/SerializationFeature.java rename to databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java index 1e0f581f7..055cb4bec 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/SerializationFeature.java +++ b/databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature; +import dev.metaschema.core.configuration.AbstractConfigurationFeature; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ValidationContext.java b/databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ValidationContext.java rename to databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java index db913f78d..43ee4e27a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ValidationContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.SimpleResourceLocation; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.SimpleResourceLocation; +import dev.metaschema.core.util.ObjectUtils; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java rename to databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java index c8f3b4fd1..6c3503174 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -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.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.AbstractDeserializer; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractDeserializer; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import java.io.IOException; import java.io.Reader; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java index 1bbba3c1e..283b15c63 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.databind.io.AbstractProblemHandler; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.databind.io.AbstractProblemHandler; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import java.io.IOException; import java.util.HashSet; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java rename to databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java index 6ebc99b67..230554db8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.AbstractSerializer; -import gov.nist.secauto.metaschema.databind.io.SerializationFeature; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractSerializer; +import dev.metaschema.databind.io.SerializationFeature; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import java.io.IOException; import java.io.Writer; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonParsingContext.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java rename to databind/src/main/java/dev/metaschema/databind/io/json/IJsonParsingContext.java index e93d655f4..e8bda7c92 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonParsingContext.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.databind.io.IParsingContext; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.io.IParsingContext; +import dev.metaschema.databind.model.info.IItemReadHandler; /** * Provides the parsing context for reading JSON-based Metaschema module diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java index ddfe28e56..c3fc43fd4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.IProblemHandler; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.IProblemHandler; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonWritingContext.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java rename to databind/src/main/java/dev/metaschema/databind/io/json/IJsonWritingContext.java index c82872107..7f19c69d7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonWritingContext.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonGenerator; -import gov.nist.secauto.metaschema.databind.io.IWritingContext; +import dev.metaschema.databind.io.IWritingContext; /** * Provides the writing context for serializing Java objects to JSON format. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/JsonFactoryFactory.java b/databind/src/main/java/dev/metaschema/databind/io/json/JsonFactoryFactory.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/JsonFactoryFactory.java rename to databind/src/main/java/dev/metaschema/databind/io/json/JsonFactoryFactory.java index feadc67f8..796ed40e5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/JsonFactoryFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/JsonFactoryFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java rename to databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java index 764aec270..87f5ffe75 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonLocation; import com.fasterxml.jackson.core.JsonParser; @@ -11,34 +11,34 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.SimpleResourceLocation; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.PathTracker; -import gov.nist.secauto.metaschema.databind.io.ValidationContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstance; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedNamed; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.info.AbstractModelInstanceReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.SimpleResourceLocation; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.PathTracker; +import dev.metaschema.databind.io.ValidationContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstance; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedNamed; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.info.AbstractModelInstanceReadHandler; +import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java rename to databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java index 3fe093257..0fc8f7454 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModel; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundProperty; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java rename to databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java index 62c3457a2..e9801dea4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java @@ -3,32 +3,32 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import com.fasterxml.jackson.core.JsonGenerator; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstance; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedNamed; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.info.AbstractModelInstanceWriteHandler; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstance; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedNamed; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.info.AbstractModelInstanceWriteHandler; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import org.eclipse.jdt.annotation.NotOwning; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/package-info.java b/databind/src/main/java/dev/metaschema/databind/io/json/package-info.java similarity index 69% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/package-info.java rename to databind/src/main/java/dev/metaschema/databind/io/json/package-info.java index a592f08c8..0c4b4d38b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/package-info.java @@ -18,9 +18,9 @@ *

        * The JSON implementation uses Jackson for JSON processing. * - * @see gov.nist.secauto.metaschema.databind.io.json.DefaultJsonDeserializer - * @see gov.nist.secauto.metaschema.databind.io.json.DefaultJsonSerializer - * @see gov.nist.secauto.metaschema.databind.io.json.IJsonProblemHandler + * @see dev.metaschema.databind.io.json.DefaultJsonDeserializer + * @see dev.metaschema.databind.io.json.DefaultJsonSerializer + * @see dev.metaschema.databind.io.json.IJsonProblemHandler */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/package-info.java b/databind/src/main/java/dev/metaschema/databind/io/package-info.java similarity index 68% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/package-info.java rename to databind/src/main/java/dev/metaschema/databind/io/package-info.java index 8bfdf5142..92465980b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/io/package-info.java @@ -16,10 +16,10 @@ *

      • Problem handling interfaces for customizing error recovery
        • *
      * - * @see gov.nist.secauto.metaschema.databind.io.ISerializer - * @see gov.nist.secauto.metaschema.databind.io.IDeserializer - * @see gov.nist.secauto.metaschema.databind.io.IBoundLoader - * @see gov.nist.secauto.metaschema.databind.io.Format + * @see dev.metaschema.databind.io.ISerializer + * @see dev.metaschema.databind.io.IDeserializer + * @see dev.metaschema.databind.io.IBoundLoader + * @see dev.metaschema.databind.io.Format */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java b/databind/src/main/java/dev/metaschema/databind/io/xml/CommentFilter.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/CommentFilter.java index 0078cf41b..d1ebea3da 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/CommentFilter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; import javax.xml.stream.EventFilter; import javax.xml.stream.XMLStreamConstants; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java similarity index 89% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java index b94061347..b28711cb9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; import com.ctc.wstx.stax.WstxInputFactory; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -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.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.AbstractDeserializer; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractDeserializer; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLInputFactory2; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java index 0c53132c1..9e242c50a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.AbstractProblemHandler; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractProblemHandler; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java index b7e5706f3..3343a00c5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.AbstractSerializer; -import gov.nist.secauto.metaschema.databind.io.SerializationFeature; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractSerializer; +import dev.metaschema.databind.io.SerializationFeature; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java index e428a1b9e..95e1112c3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.IParsingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.IParsingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceModel; import org.codehaus.stax2.XMLEventReader2; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java index ee93e3e8c..1e193e74a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.IProblemHandler; -import gov.nist.secauto.metaschema.databind.io.ValidationContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.IProblemHandler; +import dev.metaschema.databind.io.ValidationContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; import java.io.IOException; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java index 056842d75..87d725e73 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.IWritingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.IWritingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java index c4e8cd848..8f7e64641 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java @@ -3,36 +3,36 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IResourceLocation; -import gov.nist.secauto.metaschema.core.model.SimpleResourceLocation; -import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil; -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.Format; -import gov.nist.secauto.metaschema.databind.io.PathTracker; -import gov.nist.secauto.metaschema.databind.io.ValidationContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedNamed; -import gov.nist.secauto.metaschema.databind.model.info.AbstractModelInstanceReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +package dev.metaschema.databind.io.xml; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.SimpleResourceLocation; +import dev.metaschema.core.model.util.XmlEventUtil; +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.Format; +import dev.metaschema.databind.io.PathTracker; +import dev.metaschema.databind.io.ValidationContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedNamed; +import dev.metaschema.databind.model.info.AbstractModelInstanceReadHandler; +import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java index 56e2af0d5..036cdd379 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java @@ -3,30 +3,30 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonProblemHandler; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedNamed; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelNamed; -import gov.nist.secauto.metaschema.databind.model.info.AbstractModelInstanceWriteHandler; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +package dev.metaschema.databind.io.xml; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.databind.io.json.DefaultJsonProblemHandler; +import dev.metaschema.databind.model.IBoundDefinitionModel; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedNamed; +import dev.metaschema.databind.model.IBoundInstanceModelNamed; +import dev.metaschema.databind.model.info.AbstractModelInstanceWriteHandler; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/package-info.java b/databind/src/main/java/dev/metaschema/databind/io/xml/package-info.java similarity index 71% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/package-info.java rename to databind/src/main/java/dev/metaschema/databind/io/xml/package-info.java index 2c0c90701..35d39c14d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/package-info.java @@ -19,9 +19,9 @@ * The XML implementation uses StAX (Streaming API for XML) for XML processing, * specifically the Woodstox implementation. * - * @see gov.nist.secauto.metaschema.databind.io.xml.DefaultXmlDeserializer - * @see gov.nist.secauto.metaschema.databind.io.xml.DefaultXmlSerializer - * @see gov.nist.secauto.metaschema.databind.io.xml.IXmlProblemHandler + * @see dev.metaschema.databind.io.xml.DefaultXmlDeserializer + * @see dev.metaschema.databind.io.xml.DefaultXmlSerializer + * @see dev.metaschema.databind.io.xml.IXmlProblemHandler */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java rename to databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java index 9c69cf9be..8f7c3da00 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.yaml; +package dev.metaschema.databind.io.yaml; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonDeserializer; -import gov.nist.secauto.metaschema.databind.io.yaml.impl.YamlFactoryFactory; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.json.DefaultJsonDeserializer; +import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java rename to databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java index 756f671c3..b9408c3a1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.yaml; +package dev.metaschema.databind.io.yaml; import com.fasterxml.jackson.core.JsonFactory; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonSerializer; -import gov.nist.secauto.metaschema.databind.io.yaml.impl.YamlFactoryFactory; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.json.DefaultJsonSerializer; +import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/YamlOperations.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/YamlOperations.java rename to databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java index 3788006c4..2abf4d67a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/YamlOperations.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.yaml; +package dev.metaschema.databind.io.yaml; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java rename to databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java index 6b34fdca2..1d1cc6856 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.yaml.impl; +package dev.metaschema.databind.io.yaml.impl; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.io.SerializationFeature; -import gov.nist.secauto.metaschema.databind.io.json.JsonFactoryFactory; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.SerializationFeature; +import dev.metaschema.databind.io.json.JsonFactoryFactory; import org.yaml.snakeyaml.LoaderOptions; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/package-info.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/package-info.java similarity index 58% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/package-info.java rename to databind/src/main/java/dev/metaschema/databind/io/yaml/impl/package-info.java index 0db9e0274..5f6d9559b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.metapath; +package dev.metaschema.databind.io.yaml.impl; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/package-info.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/package-info.java similarity index 71% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/package-info.java rename to databind/src/main/java/dev/metaschema/databind/io/yaml/package-info.java index 944175480..b1df23332 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/package-info.java @@ -7,4 +7,4 @@ * Supports reading and writing YAML instance data. */ -package gov.nist.secauto.metaschema.databind.io.yaml; +package dev.metaschema.databind.io.yaml; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/DatabindFunctionLibrary.java b/databind/src/main/java/dev/metaschema/databind/metapath/function/DatabindFunctionLibrary.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/DatabindFunctionLibrary.java rename to databind/src/main/java/dev/metaschema/databind/metapath/function/DatabindFunctionLibrary.java index fb0818aaa..9463a6621 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/DatabindFunctionLibrary.java +++ b/databind/src/main/java/dev/metaschema/databind/metapath/function/DatabindFunctionLibrary.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.metapath.function; +package dev.metaschema.databind.metapath.function; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary; +import dev.metaschema.core.metapath.function.FunctionLibrary; /** * Function library providing databind-specific Metapath functions. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java b/databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java rename to databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java index 1716fb2a2..9eba3a2fd 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java +++ b/databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.metapath.function; +package dev.metaschema.databind.metapath.function; -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.item.IItem; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModelElement; +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.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.metaschema.IBindingModelElement; import java.util.List; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/test/util/package-info.java b/databind/src/main/java/dev/metaschema/databind/metapath/function/package-info.java similarity index 57% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/test/util/package-info.java rename to databind/src/main/java/dev/metaschema/databind/metapath/function/package-info.java index 2e037a2f3..724ed64d7 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/test/util/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/metapath/function/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.test.util; +package dev.metaschema.databind.metapath.function; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/impl/package-info.java b/databind/src/main/java/dev/metaschema/databind/metapath/package-info.java similarity index 56% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/impl/package-info.java rename to databind/src/main/java/dev/metaschema/databind/metapath/package-info.java index 364a68eef..0ae6a15f6 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/impl/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/metapath/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.yaml.impl; +package dev.metaschema.databind.metapath; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java b/databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java rename to databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java index 9256affba..11408499a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; - -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.AbstractModule; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.annotations.NsBinding; +package dev.metaschema.databind.model; + +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.AbstractModule; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.databind.model.annotations.NsBinding; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinition.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinition.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinition.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinition.java index 463b4752e..c0aac5ea4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinition.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinition.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IDefinition; /** * A Metaschema definition (flag, field, or assembly) bound to Java data. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionFlag.java similarity index 71% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionFlag.java index 8fa6f7419..c3ffce6da 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionFlag.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagDefinition; /** * Represents a flag definition/instance bound to Java field. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java index 52dafcff6..fc1e20b52 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag; -import gov.nist.secauto.metaschema.databind.IBindingContext; +import dev.metaschema.core.model.IFeatureContainerFlag; +import dev.metaschema.databind.IBindingContext; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java index e93d57fa4..c9823b65c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelAssembly; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IFeatureContainerModelAssembly; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java index fbf270824..c1ab96c87 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java index 972cad528..fdab029b3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldDefinition; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java index 5175db751..3ad315c66 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +package dev.metaschema.databind.model; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java index e83597fcf..21e8b4e56 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java index 2496907a1..76585b8ca 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IInstance; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java index 857846402..2402aad3f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceFlagInline; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +package dev.metaschema.databind.model; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IFeatureDefinitionInstanceInlined; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.impl.InstanceFlagInline; +import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java index a2855d8c8..fba8959ae 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java index 66f83de44..fafb54c43 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelAssemblyComplex; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.impl.InstanceModelAssemblyComplex; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java index 746c3cd29..f4a8cee3e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelGrouped; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +package dev.metaschema.databind.model; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IFeatureContainerModelGrouped; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.impl.InstanceModelChoiceGroup; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java index 1b2c9f620..cfb54f3a2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.impl.DefinitionField; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelFieldScalar; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.impl.DefinitionField; +import dev.metaschema.databind.model.impl.InstanceModelFieldComplex; +import dev.metaschema.databind.model.impl.InstanceModelFieldScalar; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java index 3e6b73456..4d405c878 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +package dev.metaschema.databind.model; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java index 4b87c5087..c6cc3e4b7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +package dev.metaschema.databind.model; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFeatureDefinitionInstanceInlined; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java index 1e8e60ac8..542614774 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.impl.InstanceModelGroupedAssembly; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java index b906138e4..51fd12f9d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedField; -import gov.nist.secauto.metaschema.databind.model.impl.DefinitionField; -import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelGroupedFieldComplex; -import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler; -import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.annotations.BoundGroupedField; +import dev.metaschema.databind.model.impl.DefinitionField; +import dev.metaschema.databind.model.impl.InstanceModelGroupedFieldComplex; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import java.io.IOException; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java index fbb5e00bd..71343593c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java index 0e9551710..ccd66267a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModelElement.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundModelElement.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModelElement.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundModelElement.java index d38c061d4..ccd558cb4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModelElement.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundModelElement.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.IModelElement; /** * A Metaschema model element bound to Java data. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModelObject.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModelObject.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java index 5f956754e..edd1732eb 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModelObject.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.databind.model.info.IItemValueHandler; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.databind.model.info.IItemValueHandler; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java index f4c282ff9..223eaa374 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IModuleExtended; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; +import dev.metaschema.core.model.IModuleExtended; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java rename to databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java index 37b5fa995..c2dce78a3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IJsonNamed; -import gov.nist.secauto.metaschema.databind.io.BindingException; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IJsonNamed; +import dev.metaschema.databind.io.BindingException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IFeatureJavaField.java b/databind/src/main/java/dev/metaschema/databind/model/IFeatureJavaField.java similarity index 98% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IFeatureJavaField.java rename to databind/src/main/java/dev/metaschema/databind/model/IFeatureJavaField.java index 31da6a61b..e7569d363 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IFeatureJavaField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IFeatureJavaField.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; import java.lang.reflect.Field; import java.lang.reflect.Type; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java rename to databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java index 88c3a9ea6..bffa8e9e1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IValuedMutable.java b/databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IValuedMutable.java rename to databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java index 93b473c19..9201d2a1b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IValuedMutable.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; -import gov.nist.secauto.metaschema.core.model.IValued; +import dev.metaschema.core.model.IValued; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValue.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValue.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValue.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValue.java index 12685c3d9..a76e20ece 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValue.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java index a6c5fde90..ce9ca14a7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AssemblyConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/AssemblyConstraints.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AssemblyConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/AssemblyConstraints.java index 631e4fc9b..2064c1709 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AssemblyConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/AssemblyConstraints.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java index c4623ea61..b14f91732 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IGroupable; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundChoice.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoice.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundChoice.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoice.java index b0a279ded..429b04f38 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundChoice.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoice.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundChoiceGroup.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java index 81431d752..bba804336 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IGroupable; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java index 6d73fabc7..1770cc6db 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IGroupable; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IGroupable; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFieldValue.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFieldValue.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java index 9d4603bb1..aa8927bfc 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFieldValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java index 46e857640..cf775433c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java index 0c4113bd2..459787fc2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IBoundObject; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java index d1ab974e9..d5ae0c3fc 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IBoundObject; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java index a37243c0c..edaca08ee 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java index 9b14c10f7..6565e9934 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java index d65fe3c15..73ee007e7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Ignore.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Ignore.java index 9b68a6232..f8e5124c3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Ignore.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java index 97723e2ed..f04405031 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java index 3771aef85..a87b425a3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java index 6121f3639..2058c6397 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java index b045f7c52..374c4c127 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/JsonKey.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/JsonKey.java index cb5c69755..02ac628d1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/JsonKey.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/KeyField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/KeyField.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/KeyField.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/KeyField.java index 6d3cd1505..e6b0e3e69 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/KeyField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/KeyField.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Let.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Let.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Let.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Let.java index 615230003..8bd6d4d2a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Let.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Let.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java index 961566747..8ced87bdd 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java index 4375a1aa2..b80738c68 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IBoundModule; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java similarity index 94% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java index 1bb7bebef..41d02d787 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.databind.model.IBoundModule; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaModule.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaModule.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java index 0a50ed4c5..d2dd21e30 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundModule; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaPackage.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaPackage.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java index 6bc82b663..1ba9543b9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaPackage.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.model.IBoundModule; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java index ca29e4340..971826798 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.impl.DefaultGroupAs; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.impl.DefaultGroupAs; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NsBinding.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/NsBinding.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NsBinding.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/NsBinding.java index 92b013ab7..1ca0d6b4c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NsBinding.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/NsBinding.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java index 4d2083eba..d74ed838e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.ICollectionValue; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey; -import gov.nist.secauto.metaschema.core.metapath.type.IItemType; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.databind.model.annotations.NullJavaTypeAdapter.VoidItem; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IMapKey; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.databind.model.annotations.NullJavaTypeAdapter.VoidItem; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Property.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Property.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java index a43c65d10..cfba4a4d5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Property.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IAttributable; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Report.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Report.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java index 66db5144a..28ca4753f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Report.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ValueConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/ValueConstraints.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ValueConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/ValueConstraints.java index a01fab3a6..73722fecf 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ValueConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/ValueConstraints.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/XmlNs.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/XmlNs.java index 8675d5a51..73d94c924 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/XmlNs.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/XmlNsForm.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/XmlNsForm.java index e35c1b827..b7ba70188 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/XmlNsForm.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; /** * Specifies the namespace qualification behavior for XML elements. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/XmlSchema.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/XmlSchema.java index 5cfedb920..5e6d5196c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/XmlSchema.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/package-info.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/package-info.java rename to databind/src/main/java/dev/metaschema/databind/model/annotations/package-info.java index aa895efc1..37b7275b9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/package-info.java @@ -9,4 +9,4 @@ */ // REFACTOR: Consider removing some child annotations in favor of Class values -package gov.nist.secauto.metaschema.databind.model.annotations; +package dev.metaschema.databind.model.annotations; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java index f335e0a38..205290dc0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundModule; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelGenerator.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java index fdc651e5d..1fd579c8f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.model.DefaultAssemblyModelBuilder; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -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.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelNamed; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoice; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.Ignore; +import dev.metaschema.core.model.DefaultAssemblyModelBuilder; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.model.IBoundInstanceModelNamed; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoice; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.Ignore; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/BoundInstanceModelChoice.java b/databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/BoundInstanceModelChoice.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java index c04364c92..291a34528 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/BoundInstanceModelChoice.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractChoiceInstance; -import gov.nist.secauto.metaschema.core.model.DefaultChoiceModelBuilder; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelNamed; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractChoiceInstance; +import dev.metaschema.core.model.DefaultChoiceModelBuilder; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.model.IBoundInstanceModelNamed; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java b/databind/src/main/java/dev/metaschema/databind/model/impl/ClassIntrospector.java similarity index 98% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/ClassIntrospector.java index da4c777b1..9b37511cb 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/ClassIntrospector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; import java.lang.reflect.Method; import java.util.Collections; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java index b312ea0b8..caf309270 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java @@ -3,44 +3,44 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.DataTypeService; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractConfigurableMessageConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractKeyConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IReportConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.Expect; -import gov.nist.secauto.metaschema.databind.model.annotations.HasCardinality; -import gov.nist.secauto.metaschema.databind.model.annotations.Index; -import gov.nist.secauto.metaschema.databind.model.annotations.IndexHasKey; -import gov.nist.secauto.metaschema.databind.model.annotations.IsUnique; -import gov.nist.secauto.metaschema.databind.model.annotations.KeyField; -import gov.nist.secauto.metaschema.databind.model.annotations.Let; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.annotations.Report; -import gov.nist.secauto.metaschema.databind.model.annotations.NullJavaTypeAdapter; -import gov.nist.secauto.metaschema.databind.model.annotations.Property; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.DataTypeService; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AbstractConfigurableMessageConstraintBuilder; +import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; +import dev.metaschema.core.model.constraint.AbstractKeyConstraintBuilder; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IReportConstraint; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.Expect; +import dev.metaschema.databind.model.annotations.HasCardinality; +import dev.metaschema.databind.model.annotations.Index; +import dev.metaschema.databind.model.annotations.IndexHasKey; +import dev.metaschema.databind.model.annotations.IsUnique; +import dev.metaschema.databind.model.annotations.KeyField; +import dev.metaschema.databind.model.annotations.Let; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.annotations.Report; +import dev.metaschema.databind.model.annotations.NullJavaTypeAdapter; +import dev.metaschema.databind.model.annotations.Property; import java.util.Arrays; import java.util.regex.Pattern; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java index 650442c20..238e6fbb8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.databind.model.annotations.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.databind.model.annotations.AssemblyConstraints; +import dev.metaschema.databind.model.annotations.ValueConstraints; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefaultGroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefaultGroupAs.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java index 0e41acfad..29041a1d3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefaultGroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.ModelUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java index 1f56a03e1..033e27a2f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java @@ -3,35 +3,35 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -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.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelNamed; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.annotations.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.model.IBoundInstanceModelNamed; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.annotations.AssemblyConstraints; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.annotations.ValueConstraints; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java index b5cb058f6..26a472d51 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java @@ -3,31 +3,31 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.Ignore; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.Ignore; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.annotations.ValueConstraints; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FieldSupport.java b/databind/src/main/java/dev/metaschema/databind/model/impl/FieldSupport.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FieldSupport.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/FieldSupport.java index eb888c79a..b98448201 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FieldSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/FieldSupport.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java b/databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java index 90215a9b6..9f3184cc1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.Ignore; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.Ignore; import java.lang.reflect.Field; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java index 8d690a444..33bf96d95 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.model.IGroupable; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; +import dev.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.databind.model.IGroupAs; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java index 533dac5ef..556ec4ee2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractInlineFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractInlineFlagDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionFlag; +import dev.metaschema.databind.model.IBoundDefinitionModel; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; +import dev.metaschema.databind.model.annotations.JsonKey; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.annotations.ValueConstraints; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java index 5952127ea..f34a6b329 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractAssemblyInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java index 6ccd8c951..fbd0b9f24 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.model.AbstractChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.DefaultChoiceGroupModelBuilder; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedNamed; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedField; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +import dev.metaschema.core.model.AbstractChoiceGroupInstance; +import dev.metaschema.core.model.DefaultChoiceGroupModelBuilder; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedNamed; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.BoundGroupedField; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java index 274d26969..a392266c9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractFieldInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java index 502568c94..ca6119141 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java @@ -3,31 +3,31 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelField; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractInlineFieldDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelField; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java index b20e1b5d1..cc59562e5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractAssemblyInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.ModelUtil; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java rename to databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java index 5f072125a..786f0f43b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedField; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; +package dev.metaschema.databind.model.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.AbstractFieldInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.databind.model.IBoundProperty; +import dev.metaschema.databind.model.annotations.BoundGroupedField; +import dev.metaschema.databind.model.annotations.ModelUtil; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/impl/package-info.java new file mode 100644 index 000000000..012513c51 --- /dev/null +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/package-info.java @@ -0,0 +1,12 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides an implementation of the Module model + * ({@link dev.metaschema.core.model}) represented by bound Java class + * annotations ({@link dev.metaschema.databind.model.annotations}). + */ + +package dev.metaschema.databind.model.impl; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java rename to databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java index 9036034c1..152f0bcc1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModel; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java index 7e8ec30a0..5a6913362 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelNamed; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.databind.model.IBoundInstanceModelNamed; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java index 7fab57793..a4b2d0430 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModel; import java.io.IOException; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java index 5283ab73c..788aa3bd3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundProperty; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundProperty; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java index 7477d1563..ddce0e637 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.IValuedMutable; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IValuedMutable; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java index c524c6a6c..c4fd2d2df 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java index 61b4dfc40..d44aa7fc8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.io.BindingException; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.BindingException; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java index ee75459af..a4f474cd7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundFieldValue; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelFieldComplex; +import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; import java.io.IOException; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java index 3a3e21e2e..2302b46cc 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceModel; import java.io.IOException; import java.lang.reflect.Field; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceReadHandler.java similarity index 97% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceReadHandler.java index 1eeb2b8f9..d2fa28611 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceReadHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; import java.io.IOException; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceWriteHandler.java similarity index 96% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java rename to databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceWriteHandler.java index 1cb7d53ec..a7a9233b1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceWriteHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; import java.io.IOException; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java rename to databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java index d54071b49..5d30e2620 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.model.IBoundInstanceModel; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceModel; import java.io.IOException; import java.lang.reflect.ParameterizedType; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java rename to databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java index a84008866..d1107ae0a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel; +package dev.metaschema.databind.model.info; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; import java.io.IOException; import java.lang.reflect.ParameterizedType; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java rename to databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java index e84953e96..58ff541d4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -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.model.IBoundInstanceModel; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceModel; import java.io.IOException; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/info/package-info.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/package-info.java rename to databind/src/main/java/dev/metaschema/databind/model/info/package-info.java index 82c47a630..4fcfdeaa0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/package-info.java @@ -7,4 +7,4 @@ * Provides classes for model property information and data item handling. */ -package gov.nist.secauto.metaschema.databind.model.info; +package dev.metaschema.databind.model.info; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java index e2d8fd58b..75a9b491c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java @@ -3,37 +3,37 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; - -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.AbstractLoader; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyTargetedConstraints; -import gov.nist.secauto.metaschema.core.model.constraint.DefaultScopedContraints; -import gov.nist.secauto.metaschema.core.model.constraint.FieldTargetedConstraints; -import gov.nist.secauto.metaschema.core.model.constraint.FlagTargetedConstraints; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.IScopedContraints; -import gov.nist.secauto.metaschema.core.model.constraint.ITargetedConstraints; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.MetaConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.ScopedConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathContext; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetapath; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport; +package dev.metaschema.databind.model.metaschema; + +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.AbstractLoader; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.AssemblyTargetedConstraints; +import dev.metaschema.core.model.constraint.DefaultScopedContraints; +import dev.metaschema.core.model.constraint.FieldTargetedConstraints; +import dev.metaschema.core.model.constraint.FlagTargetedConstraints; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.constraint.IScopedContraints; +import dev.metaschema.core.model.constraint.ITargetedConstraints; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.MetaConstraintSet; +import dev.metaschema.core.model.constraint.ScopedConstraintSet; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; +import dev.metaschema.databind.model.metaschema.binding.MetapathContext; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaMetapath; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints; +import dev.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport; import java.io.IOException; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java index 0c48f3cfa..246127055 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.AbstractModuleLoader; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -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.metaschema.databind.model.metaschema.binding.METASCHEMA; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.Import; -import gov.nist.secauto.metaschema.databind.model.metaschema.impl.BindingModule; +package dev.metaschema.databind.model.metaschema; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.AbstractModuleLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA.Import; +import dev.metaschema.databind.model.metaschema.impl.BindingModule; import java.io.IOException; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModel.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingDefinitionModel.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModel.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingDefinitionModel.java index bfc9ab992..7043c20fb 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingDefinitionModel.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelDefinition; /** * Represents a Metaschema model definition loaded via data binding. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModelAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingDefinitionModelAssembly.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModelAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingDefinitionModelAssembly.java index a6f6b1418..795b85bf5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModelAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingDefinitionModelAssembly.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyDefinition; /** * Represents a Metaschema assembly definition loaded via data binding. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstance.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstance.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java index dd27a9ba9..c140ec3f7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstance.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModel.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstanceModel.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModel.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstanceModel.java index e151b3432..d19850ae8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstanceModel.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstance; /** * Represents a Metaschema model instance loaded via data binding. diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java similarity index 71% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java index 31094e174..fdb64bd7b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.model.IMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.model.IMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModelElement.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModelElement.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java index 38823ff47..6ad9bf227 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModelElement.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.IModelElement; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.IModelElement; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModuleLoader.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModuleLoader.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java index 2f1050992..b7e415a16 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModuleLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IModuleLoader; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModuleLoader; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.DeserializationFeature; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConfigurableMessageConstraintBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConfigurableMessageConstraintBase.java similarity index 92% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConfigurableMessageConstraintBase.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IConfigurableMessageConstraintBase.java index a03e80293..6d71b9f0b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConfigurableMessageConstraintBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConfigurableMessageConstraintBase.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java index 7197e9cf7..4a4a076e8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.databind.model.metaschema.binding.Property; +import dev.metaschema.databind.model.metaschema.binding.Remarks; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IModelConstraintsBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IModelConstraintsBase.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IModelConstraintsBase.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IModelConstraintsBase.java index 5c1af6c87..65e9f6402 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IModelConstraintsBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IModelConstraintsBase.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/ITargetedConstraintBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/ITargetedConstraintBase.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/ITargetedConstraintBase.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/ITargetedConstraintBase.java index 0785deda1..c8a9f61a1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/ITargetedConstraintBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/ITargetedConstraintBase.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java index f4de460cc..de59da0c4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintLetExpression; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.databind.model.metaschema.binding.ConstraintLetExpression; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java index ae35c6314..e0c2dd131 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java index d013d2e39..0e0ea29d4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.databind.IBindingContext; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.IBindingContext; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Any.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java similarity index 61% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Any.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java index f27405d49..b61203387 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Any.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java @@ -2,15 +2,15 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -25,8 +25,7 @@ public class Any implements IBoundObject { private final IMetaschemaData __metaschemaData; /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Any} + * Constructs a new {@code dev.metaschema.databind.model.metaschema.binding.Any} * instance with no metadata. */ public Any() { @@ -34,8 +33,7 @@ public Any() { } /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Any} + * Constructs a new {@code dev.metaschema.databind.model.metaschema.binding.Any} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java similarity index 81% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java index e6f1082f2..f1bf42e37 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java @@ -2,22 +2,22 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.metaschema.IModelConstraintsBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IModelConstraintsBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -65,7 +65,7 @@ public class AssemblyConstraints implements IModelConstraintsBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints} * instance with no metadata. */ public AssemblyConstraints() { @@ -74,7 +74,7 @@ public AssemblyConstraints() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyModel.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyModel.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java index 8ca879fdc..e045c8a4a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java @@ -2,36 +2,36 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoice; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoice; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -71,7 +71,7 @@ public class AssemblyModel implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel} * instance with no metadata. */ public AssemblyModel() { @@ -80,7 +80,7 @@ public AssemblyModel() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel} * instance with the specified metadata. * * @param data @@ -176,7 +176,7 @@ public static class Choice implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice} * instance with no metadata. */ public Choice() { @@ -185,7 +185,7 @@ public Choice() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice} * instance with the specified metadata. * * @param data @@ -327,7 +327,7 @@ public static class ChoiceGroup implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup} * instance with no metadata. */ public ChoiceGroup() { @@ -336,7 +336,7 @@ public ChoiceGroup() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup} * instance with the specified metadata. * * @param data @@ -601,7 +601,7 @@ public static class Assembly implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Assembly} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Assembly} * instance with no metadata. */ public Assembly() { @@ -610,7 +610,7 @@ public Assembly() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Assembly} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Assembly} * instance with the specified metadata. * * @param data @@ -971,7 +971,7 @@ public static class DefineAssembly implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineAssembly} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineAssembly} * instance with no metadata. */ public DefineAssembly() { @@ -980,7 +980,7 @@ public DefineAssembly() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineAssembly} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineAssembly} * instance with the specified metadata. * * @param data @@ -1432,7 +1432,7 @@ public static class Field implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Field} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Field} * instance with no metadata. */ public Field() { @@ -1441,7 +1441,7 @@ public Field() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Field} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.Field} * instance with the specified metadata. * * @param data @@ -1930,7 +1930,7 @@ public static class DefineField implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineField} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineField} * instance with no metadata. */ public DefineField() { @@ -1939,7 +1939,7 @@ public DefineField() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineField} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup.DefineField} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java index 16affc73b..b79964aaa 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -132,7 +132,7 @@ public class AssemblyReference implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyReference} * instance with no metadata. */ public AssemblyReference() { @@ -141,7 +141,7 @@ public AssemblyReference() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference} + * {@code dev.metaschema.databind.model.metaschema.binding.AssemblyReference} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java index 9eef19feb..68656642d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java @@ -2,21 +2,21 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -56,7 +56,7 @@ public class ConstraintLetExpression implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintLetExpression} + * {@code dev.metaschema.databind.model.metaschema.binding.ConstraintLetExpression} * instance with no metadata. */ public ConstraintLetExpression() { @@ -65,7 +65,7 @@ public ConstraintLetExpression() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintLetExpression} + * {@code dev.metaschema.databind.model.metaschema.binding.ConstraintLetExpression} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java similarity index 72% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java index 0f1bceb4c..d9f7d034f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java @@ -2,23 +2,23 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.metaschema.impl.AbstractAllowedValue; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.metaschema.impl.AbstractAllowedValue; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -57,7 +57,7 @@ public class ConstraintValueEnum /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintValueEnum} + * {@code dev.metaschema.databind.model.metaschema.binding.ConstraintValueEnum} * instance with no metadata. */ public ConstraintValueEnum() { @@ -66,7 +66,7 @@ public ConstraintValueEnum() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintValueEnum} + * {@code dev.metaschema.databind.model.metaschema.binding.ConstraintValueEnum} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Example.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Example.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java index 0d45dab8c..6cc5aa41e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Example.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java @@ -2,22 +2,22 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.net.URI; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -61,8 +61,8 @@ public class Example implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Example} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.Example} instance + * with no metadata. */ public Example() { this(null); @@ -70,8 +70,8 @@ public Example() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Example} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.Example} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java index 7cd2993cd..f11bc9b88 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java @@ -2,22 +2,22 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; +import dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -59,7 +59,7 @@ public class FieldConstraints implements IValueTargetedConstraintsBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.FieldConstraints} * instance with no metadata. */ public FieldConstraints() { @@ -68,7 +68,7 @@ public FieldConstraints() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.FieldConstraints} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java index 15d4b39f9..cd82dc1f3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java @@ -2,33 +2,33 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -153,7 +153,7 @@ public class FieldReference implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference} + * {@code dev.metaschema.databind.model.metaschema.binding.FieldReference} * instance with no metadata. */ public FieldReference() { @@ -162,7 +162,7 @@ public FieldReference() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference} + * {@code dev.metaschema.databind.model.metaschema.binding.FieldReference} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java index 1e9adff01..7130995ac 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -141,7 +141,7 @@ public class FlagAllowedValues implements IBoundObject, IConstraintBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagAllowedValues} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagAllowedValues} * instance with no metadata. */ public FlagAllowedValues() { @@ -150,7 +150,7 @@ public FlagAllowedValues() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagAllowedValues} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagAllowedValues} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java similarity index 79% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java index c83b58a14..9a84933a2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java @@ -2,22 +2,22 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.metaschema.IConstraintBase; +import dev.metaschema.databind.model.metaschema.IValueConstraintsBase; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -59,7 +59,7 @@ public class FlagConstraints implements IValueConstraintsBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagConstraints} * instance with no metadata. */ public FlagConstraints() { @@ -68,7 +68,7 @@ public FlagConstraints() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagConstraints} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagExpect.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagExpect.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java index 33ce4dc86..fad8b9bd4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagExpect.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -119,8 +119,8 @@ public class FlagExpect implements IBoundObject, IConfigurableMessageConstraintB /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagExpect} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.FlagExpect} instance + * with no metadata. */ public FlagExpect() { this(null); @@ -128,8 +128,8 @@ public FlagExpect() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagExpect} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.FlagExpect} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java index 3ea873e00..b028c54c7 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -127,7 +127,7 @@ public class FlagIndexHasKey implements IBoundObject, IConfigurableMessageConstr /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagIndexHasKey} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagIndexHasKey} * instance with no metadata. */ public FlagIndexHasKey() { @@ -136,7 +136,7 @@ public FlagIndexHasKey() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagIndexHasKey} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagIndexHasKey} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagMatches.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java similarity index 89% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagMatches.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java index 10ce73810..e35f01978 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagMatches.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -184,8 +184,8 @@ public class FlagMatches implements IBoundObject, IConfigurableMessageConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagMatches} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.FlagMatches} instance + * with no metadata. */ public FlagMatches() { this(null); @@ -193,8 +193,8 @@ public FlagMatches() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagMatches} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.FlagMatches} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java index a6a46117f..a96a099ed 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -127,7 +127,7 @@ public class FlagReference implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReference} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagReference} * instance with no metadata. */ public FlagReference() { @@ -136,7 +136,7 @@ public FlagReference() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReference} + * {@code dev.metaschema.databind.model.metaschema.binding.FlagReference} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReport.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java index 1d19041ae..e6986d935 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -119,8 +119,8 @@ public class FlagReport implements IBoundObject, IConfigurableMessageConstraintB /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReport} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.FlagReport} instance + * with no metadata. */ public FlagReport() { this(null); @@ -128,8 +128,8 @@ public FlagReport() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReport} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.FlagReport} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/GroupingAs.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/GroupingAs.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java index 1b848bb97..5f3d6c3f4 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/GroupingAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java @@ -2,23 +2,23 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -64,8 +64,8 @@ public class GroupingAs implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupingAs} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.GroupingAs} instance + * with no metadata. */ public GroupingAs() { this(null); @@ -73,8 +73,8 @@ public GroupingAs() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupingAs} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.GroupingAs} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java similarity index 88% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java index b80dbf698..fa79fc31d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java @@ -2,33 +2,33 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -162,7 +162,7 @@ public class InlineDefineAssembly implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly} + * {@code dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly} * instance with no metadata. */ public InlineDefineAssembly() { @@ -171,7 +171,7 @@ public InlineDefineAssembly() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly} + * {@code dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineField.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java similarity index 91% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineField.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java index 44ea05acb..16c1f21d2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java @@ -2,36 +2,36 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoice; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoice; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -266,7 +266,7 @@ public class InlineDefineField implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField} + * {@code dev.metaschema.databind.model.metaschema.binding.InlineDefineField} * instance with no metadata. */ public InlineDefineField() { @@ -275,7 +275,7 @@ public InlineDefineField() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField} + * {@code dev.metaschema.databind.model.metaschema.binding.InlineDefineField} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java similarity index 90% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java index eb6692587..c7b2b25a5 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -196,7 +196,7 @@ public class InlineDefineFlag implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineFlag} + * {@code dev.metaschema.databind.model.metaschema.binding.InlineDefineFlag} * instance with no metadata. */ public InlineDefineFlag() { @@ -205,7 +205,7 @@ public InlineDefineFlag() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineFlag} + * {@code dev.metaschema.databind.model.metaschema.binding.InlineDefineFlag} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonKey.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonKey.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java index 1e2ffc972..1f872985d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java @@ -2,18 +2,18 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -43,8 +43,8 @@ public class JsonKey implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.JsonKey} instance + * with no metadata. */ public JsonKey() { this(null); @@ -52,8 +52,8 @@ public JsonKey() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.JsonKey} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java similarity index 69% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java index c9d415425..b755dffe9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java @@ -2,18 +2,18 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -36,7 +36,7 @@ public class JsonValueKeyFlag implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag} + * {@code dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag} * instance with no metadata. */ public JsonValueKeyFlag() { @@ -45,7 +45,7 @@ public JsonValueKeyFlag() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag} + * {@code dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/KeyConstraintField.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/KeyConstraintField.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java index a0c879044..0bca41676 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/KeyConstraintField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java @@ -2,20 +2,20 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -54,7 +54,7 @@ public class KeyConstraintField implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.KeyConstraintField} + * {@code dev.metaschema.databind.model.metaschema.binding.KeyConstraintField} * instance with no metadata. */ public KeyConstraintField() { @@ -63,7 +63,7 @@ public KeyConstraintField() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.KeyConstraintField} + * {@code dev.metaschema.databind.model.metaschema.binding.KeyConstraintField} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/METASCHEMA.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java similarity index 95% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/METASCHEMA.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java index 0b3b8afe4..a0bfae0c0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/METASCHEMA.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java @@ -2,44 +2,44 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoice; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.Expect; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Index; +import dev.metaschema.databind.model.annotations.IsUnique; +import dev.metaschema.databind.model.annotations.KeyField; +import dev.metaschema.databind.model.annotations.Let; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoice; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.Expect; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Index; -import gov.nist.secauto.metaschema.databind.model.annotations.IsUnique; -import gov.nist.secauto.metaschema.databind.model.annotations.KeyField; -import gov.nist.secauto.metaschema.databind.model.annotations.Let; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.math.BigInteger; import java.net.URI; import java.util.LinkedList; @@ -90,7 +90,7 @@ target = ".//matches/@datatype|.//(define-field|define-flag)/@as-type", test = "not(data(.)=('base64Binary','dateTime','dateTime-with-timezone','email','nonNegativeInteger','positiveInteger'))", message = "Use of the type '{ data(.) }' is deprecated. Use '{ $deprecated-type-map(data(.))}' instead.") }), - modelConstraints = @gov.nist.secauto.metaschema.databind.model.annotations.AssemblyConstraints( + modelConstraints = @dev.metaschema.databind.model.annotations.AssemblyConstraints( index = @Index(id = "module-short-name-unique", formalName = "Index Module Short Names", description = "Ensures that the current and all imported modules have a unique short name.", level = IConstraint.Level.ERROR, target = "(.|$all-imports)", name = "metaschema-metadata-short-name-index", @@ -233,8 +233,8 @@ public class METASCHEMA implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA} instance + * with no metadata. */ public METASCHEMA() { this(null); @@ -242,8 +242,8 @@ public METASCHEMA() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none @@ -632,7 +632,7 @@ public static class Import implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.Import} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.Import} * instance with no metadata. */ public Import() { @@ -641,7 +641,7 @@ public Import() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.Import} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.Import} * instance with the specified metadata. * * @param data @@ -836,7 +836,7 @@ public static class DefineAssembly implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly} * instance with no metadata. */ public DefineAssembly() { @@ -845,7 +845,7 @@ public DefineAssembly() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly} * instance with the specified metadata. * * @param data @@ -1308,7 +1308,7 @@ public static class RootName implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName} * instance with no metadata. */ public RootName() { @@ -1317,7 +1317,7 @@ public RootName() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName} * instance with the specified metadata. * * @param data @@ -1600,7 +1600,7 @@ public static class DefineField implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineField} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineField} * instance with no metadata. */ public DefineField() { @@ -1609,7 +1609,7 @@ public DefineField() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineField} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineField} * instance with the specified metadata. * * @param data @@ -2247,7 +2247,7 @@ public static class DefineFlag implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineFlag} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineFlag} * instance with no metadata. */ public DefineFlag() { @@ -2256,7 +2256,7 @@ public DefineFlag() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineFlag} + * {@code dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineFlag} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathContext.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathContext.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java index b19d4200d..7f6894f21 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathContext.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java @@ -2,21 +2,21 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -65,7 +65,7 @@ public class MetapathContext implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathContext} + * {@code dev.metaschema.databind.model.metaschema.binding.MetapathContext} * instance with no metadata. */ public MetapathContext() { @@ -74,7 +74,7 @@ public MetapathContext() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathContext} + * {@code dev.metaschema.databind.model.metaschema.binding.MetapathContext} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathNamespace.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathNamespace.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java index f1ef910c7..ab43b8d87 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathNamespace.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java @@ -2,19 +2,19 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.net.URI; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -55,7 +55,7 @@ public class MetapathNamespace implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathNamespace} + * {@code dev.metaschema.databind.model.metaschema.binding.MetapathNamespace} * instance with no metadata. */ public MetapathNamespace() { @@ -64,7 +64,7 @@ public MetapathNamespace() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathNamespace} + * {@code dev.metaschema.databind.model.metaschema.binding.MetapathNamespace} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java index 7aa9c0cbd..6987fa411 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.Expect; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.IsUnique; +import dev.metaschema.databind.model.annotations.KeyField; +import dev.metaschema.databind.model.annotations.Let; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.Expect; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.IsUnique; -import gov.nist.secauto.metaschema.databind.model.annotations.KeyField; -import gov.nist.secauto.metaschema.databind.model.annotations.Let; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.net.URI; import java.util.LinkedList; import java.util.List; @@ -50,7 +50,7 @@ level = IConstraint.Level.WARNING, target = ".//matches/@datatype|.//(define-field|define-flag)/@as-type", test = "not(data(.)=('base64Binary','dateTime','dateTime-with-timezone','email','nonNegativeInteger','positiveInteger'))", message = "Use of the type '{ data(.) }' is deprecated. Use '{ $deprecated-type-map(data(.))}' instead.")), - modelConstraints = @gov.nist.secauto.metaschema.databind.model.annotations.AssemblyConstraints(unique = { + modelConstraints = @dev.metaschema.databind.model.annotations.AssemblyConstraints(unique = { @IsUnique(id = "meta-constraints-namespace-unique-entry", formalName = "Require Unique Namespace Entries", description = "Ensures that all declared namespace entries are unique.", level = IConstraint.Level.ERROR, target = "namespace-binding", keyFields = { @KeyField(target = "@prefix"), @KeyField(target = "@uri") }), @@ -98,7 +98,7 @@ public class MetaschemaMetaConstraints implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints} * instance with no metadata. */ public MetaschemaMetaConstraints() { @@ -107,7 +107,7 @@ public MetaschemaMetaConstraints() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints} * instance with the specified metadata. * * @param data @@ -339,7 +339,7 @@ public static class Import implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.Import} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.Import} * instance with no metadata. */ public Import() { @@ -348,7 +348,7 @@ public Import() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.Import} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.Import} * instance with the specified metadata. * * @param data @@ -435,7 +435,7 @@ public static class DefinitionContext implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.DefinitionContext} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.DefinitionContext} * instance with no metadata. */ public DefinitionContext() { @@ -444,7 +444,7 @@ public DefinitionContext() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.DefinitionContext} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints.DefinitionContext} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java similarity index 69% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java index 5dd01d31e..ef7346f1a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java @@ -2,18 +2,18 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -36,7 +36,7 @@ public class MetaschemaMetapath implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetapath} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetapath} * instance with no metadata. */ public MetaschemaMetapath() { @@ -45,7 +45,7 @@ public MetaschemaMetapath() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetapath} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaMetapath} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java index 8bf456cf7..3027daf00 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java @@ -2,17 +2,17 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaModule; import java.net.URI; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java similarity index 89% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java index f49699c9a..4f6fca7ea 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java @@ -2,36 +2,36 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundChoiceGroup; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; +import dev.metaschema.databind.model.annotations.Expect; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Let; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; +import dev.metaschema.databind.model.metaschema.IValueConstraintsBase; +import dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.Expect; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Let; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; import java.net.URI; import java.util.LinkedList; import java.util.List; @@ -111,7 +111,7 @@ public class MetaschemaModuleConstraints implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints} * instance with no metadata. */ public MetaschemaModuleConstraints() { @@ -120,7 +120,7 @@ public MetaschemaModuleConstraints() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints} * instance with the specified metadata. * * @param data @@ -385,7 +385,7 @@ public static class Import implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Import} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Import} * instance with no metadata. */ public Import() { @@ -394,7 +394,7 @@ public Import() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Import} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Import} * instance with the specified metadata. * * @param data @@ -493,7 +493,7 @@ public static class Scope implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope} * instance with no metadata. */ public Scope() { @@ -502,7 +502,7 @@ public Scope() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope} * instance with the specified metadata. * * @param data @@ -681,7 +681,7 @@ public static class Assembly implements IValueTargetedConstraintsBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Assembly} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Assembly} * instance with no metadata. */ public Assembly() { @@ -690,7 +690,7 @@ public Assembly() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Assembly} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Assembly} * instance with the specified metadata. * * @param data @@ -797,7 +797,7 @@ public static class Field implements IValueTargetedConstraintsBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Field} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Field} * instance with no metadata. */ public Field() { @@ -806,7 +806,7 @@ public Field() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Field} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Field} * instance with the specified metadata. * * @param data @@ -913,7 +913,7 @@ public static class Flag implements IValueConstraintsBase { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Flag} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Flag} * instance with no metadata. */ public Flag() { @@ -922,7 +922,7 @@ public Flag() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Flag} + * {@code dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints.Scope.Flag} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Property.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Property.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java index 84daeddb5..d6047448f 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Property.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java @@ -2,21 +2,21 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.net.URI; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -54,8 +54,8 @@ public class Property implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.Property} instance + * with no metadata. */ public Property() { this(null); @@ -63,8 +63,8 @@ public Property() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.Property} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Remarks.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java similarity index 69% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Remarks.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java index 320c8ad88..50dd36ad2 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Remarks.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java @@ -2,25 +2,25 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.MarkupMultilineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultilineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -62,8 +62,8 @@ public class Remarks implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.Remarks} instance + * with no metadata. */ public Remarks() { this(null); @@ -71,8 +71,8 @@ public Remarks() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.Remarks} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java similarity index 87% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java index 5ef696da2..fd03c0978 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java @@ -2,31 +2,31 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -148,7 +148,7 @@ public class TargetedAllowedValuesConstraint implements IBoundObject, ITargetedC /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint} * instance with no metadata. */ public TargetedAllowedValuesConstraint() { @@ -157,7 +157,7 @@ public TargetedAllowedValuesConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java index f6c96aa2a..b4899caa1 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java @@ -2,32 +2,32 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -128,7 +128,7 @@ public class TargetedExpectConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint} * instance with no metadata. */ public TargetedExpectConstraint() { @@ -137,7 +137,7 @@ public TargetedExpectConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java index c74bb728d..a6d09fcf3 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java @@ -2,34 +2,34 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.Matches; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.Matches; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -138,7 +138,7 @@ public class TargetedHasCardinalityConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint} * instance with no metadata. */ public TargetedHasCardinalityConstraint() { @@ -147,7 +147,7 @@ public TargetedHasCardinalityConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java index a90245815..95936e097 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java @@ -2,32 +2,32 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -136,7 +136,7 @@ public class TargetedIndexConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint} * instance with no metadata. */ public TargetedIndexConstraint() { @@ -145,7 +145,7 @@ public TargetedIndexConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java similarity index 86% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java index ecc094eef..5e97e4f60 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java @@ -2,32 +2,32 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -136,7 +136,7 @@ public class TargetedIndexHasKeyConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint} * instance with no metadata. */ public TargetedIndexHasKeyConstraint() { @@ -145,7 +145,7 @@ public TargetedIndexHasKeyConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java index 0ac5702f0..82da4ffad 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java @@ -2,32 +2,32 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -129,7 +129,7 @@ public class TargetedIsUniqueConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint} * instance with no metadata. */ public TargetedIsUniqueConstraint() { @@ -138,7 +138,7 @@ public TargetedIsUniqueConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java similarity index 89% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java index ed6c0e77c..2e0395edc 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java @@ -2,32 +2,32 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -193,7 +193,7 @@ public class TargetedMatchesConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint} * instance with no metadata. */ public TargetedMatchesConstraint() { @@ -202,7 +202,7 @@ public TargetedMatchesConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java index 5a45d1663..634aed066 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java @@ -2,32 +2,32 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; - +package dev.metaschema.databind.model.metaschema.binding; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupLineAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -128,7 +128,7 @@ public class TargetedReportConstraint /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedReportConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedReportConstraint} * instance with no metadata. */ public TargetedReportConstraint() { @@ -137,7 +137,7 @@ public TargetedReportConstraint() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedReportConstraint} + * {@code dev.metaschema.databind.model.metaschema.binding.TargetedReportConstraint} * instance with the specified metadata. * * @param data diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/UseName.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java similarity index 71% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/UseName.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java index 31120a375..66bb28232 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/UseName.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java @@ -2,20 +2,20 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; +package dev.metaschema.databind.model.metaschema.binding; +import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaField; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; import java.math.BigInteger; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -51,8 +51,8 @@ public class UseName implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.UseName} - * instance with no metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.UseName} instance + * with no metadata. */ public UseName() { this(null); @@ -60,8 +60,8 @@ public UseName() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.databind.model.metaschema.binding.UseName} - * instance with the specified metadata. + * {@code dev.metaschema.databind.model.metaschema.binding.UseName} instance + * with the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/package-info.java new file mode 100644 index 000000000..93d77ed22 --- /dev/null +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/package-info.java @@ -0,0 +1,20 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ +// Generated from: ../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml +// Do not edit - changes will be lost when regenerated. +/** + * Provides generated Metaschema binding classes for module(s): Metaschema + * Model. + *

      + * version 1.0.0-rc.1 + */ + +@dev.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { + dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule.class }) +@dev.metaschema.databind.model.annotations.XmlSchema(namespace = "http://csrc.nist.gov/ns/oscal/metaschema/1.0", + xmlns = { @dev.metaschema.databind.model.annotations.XmlNs(prefix = "", + namespace = "http://csrc.nist.gov/ns/oscal/metaschema/1.0") }, + xmlElementFormDefault = dev.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED) +package dev.metaschema.databind.model.metaschema.binding; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java index b1837a38f..d433b9e42 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.DefaultChoiceModelBuilder; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.DefaultChoiceModelBuilder; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.binding.AssemblyReference; +import dev.metaschema.databind.model.metaschema.binding.FieldReference; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java similarity index 84% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java index ecd3de4df..ad6d7500a 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.constraint.IAllowedValue; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java index cbcf84de3..903728809 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.DefaultAssemblyModelBuilder; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.DefaultAssemblyModelBuilder; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; +import dev.metaschema.databind.model.metaschema.binding.AssemblyReference; +import dev.metaschema.databind.model.metaschema.binding.FieldReference; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingConstants.java similarity index 93% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingConstants.java index 9ee6996cd..b6686b644 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingConstants.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingConstants.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; // REFACTOR: is this needed/used? /** diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java index 0557cb0f2..4f3b9f055 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java @@ -3,30 +3,30 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -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.AbstractModule; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -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.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathNamespace; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.AbstractModule; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; +import dev.metaschema.databind.model.metaschema.binding.MetapathNamespace; import java.net.URI; import java.util.Collection; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java similarity index 85% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java index 1fe01ce13..32baeacd8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.DefaultChoiceGroupModelBuilder; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.DefaultChoiceGroupModelBuilder; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java index 25e7af672..e737cbdaa 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.DefaultChoiceModelBuilder; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.DefaultChoiceModelBuilder; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; +import dev.metaschema.databind.model.metaschema.binding.AssemblyReference; +import dev.metaschema.databind.model.metaschema.binding.FieldReference; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java similarity index 82% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java index af0e0295e..43910a194 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java @@ -3,52 +3,52 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractConfigurableMessageConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.AbstractKeyConstraintBuilder; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IExpectConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IKeyField; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; -import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.IReportConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IModelConstraintsBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintValueEnum; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagAllowedValues; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagExpect; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagIndexHasKey; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagMatches; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.KeyConstraintField; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedReportConstraint; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AbstractConfigurableMessageConstraintBuilder; +import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; +import dev.metaschema.core.model.constraint.AbstractKeyConstraintBuilder; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.ICardinalityConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IExpectConstraint; +import dev.metaschema.core.model.constraint.IIndexConstraint; +import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; +import dev.metaschema.core.model.constraint.IKeyField; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.constraint.IReportConstraint; +import dev.metaschema.core.model.constraint.IUniqueConstraint; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; +import dev.metaschema.databind.model.metaschema.IConstraintBase; +import dev.metaschema.databind.model.metaschema.IModelConstraintsBase; +import dev.metaschema.databind.model.metaschema.IValueConstraintsBase; +import dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; +import dev.metaschema.databind.model.metaschema.binding.ConstraintValueEnum; +import dev.metaschema.databind.model.metaschema.binding.FlagAllowedValues; +import dev.metaschema.databind.model.metaschema.binding.FlagExpect; +import dev.metaschema.databind.model.metaschema.binding.FlagIndexHasKey; +import dev.metaschema.databind.model.metaschema.binding.FlagMatches; +import dev.metaschema.databind.model.metaschema.binding.KeyConstraintField; +import dev.metaschema.databind.model.metaschema.binding.Property; +import dev.metaschema.databind.model.metaschema.binding.Remarks; +import dev.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint; +import dev.metaschema.databind.model.metaschema.binding.TargetedReportConstraint; import java.math.BigInteger; import java.util.List; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java similarity index 74% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java index 0ee827d4b..4bde89f57 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java @@ -3,35 +3,35 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.AbstractGlobalAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.MetaschemaModelConstants; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.AbstractGlobalAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; +import dev.metaschema.databind.model.metaschema.binding.JsonKey; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import java.util.List; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java index 8d7e0a169..c51994608 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractGlobalFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractGlobalFieldDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.FieldConstraints; +import dev.metaschema.databind.model.metaschema.binding.JsonKey; +import dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java index 2300c5289..4bb576eac 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractGlobalFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.AbstractGlobalFlagDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.FlagConstraints; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java similarity index 80% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java index 0e1c8f209..384ca1ea8 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IFlagContainerBuilder; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReference; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineFlag; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFlagContainerBuilder; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; +import dev.metaschema.databind.model.metaschema.binding.FlagReference; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineFlag; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java similarity index 62% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java index 1342f338b..01bafaf5d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.util.ModuleUtils; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupingAs; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.model.util.ModuleUtils; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.metaschema.binding.GroupingAs; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java similarity index 74% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java index 1475b8099..7d23ac869 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractInlineFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IFeatureValueless; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineFlag; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractInlineFlagDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IFeatureValueless; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.FlagConstraints; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineFlag; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java index 33caa963a..d04ccd21d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractFlagInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance; -import gov.nist.secauto.metaschema.core.model.IFeatureValueless; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReference; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractFlagInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IFeatureDefinitionReferenceInstance; +import dev.metaschema.core.model.IFeatureValueless; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.FlagReference; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java similarity index 73% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java index 687cca459..dc6ac47bb 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java @@ -3,40 +3,40 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.AbstractInlineAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.MetaschemaModelConstants; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.AbstractInlineAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; +import dev.metaschema.databind.model.metaschema.binding.JsonKey; import java.math.BigInteger; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java index 81e1dab82..cb5c0c649 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractAssemblyInstance; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyReference; import java.math.BigInteger; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java similarity index 68% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java index ac25c0c5a..c9204d789 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.AbstractChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.AbstractChoiceInstance; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java index 040ec5240..38affeb6c 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java @@ -3,25 +3,25 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.AbstractChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IContainerModelSupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.AbstractChoiceGroupInstance; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IContainerModelSupport; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; +import dev.metaschema.databind.model.metaschema.binding.JsonKey; import java.math.BigInteger; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java similarity index 74% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java index 071cb09f2..d52de2ff0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java @@ -3,36 +3,36 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractInlineFieldDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.FieldConstraints; +import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; +import dev.metaschema.databind.model.metaschema.binding.JsonKey; +import dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; import java.math.BigInteger; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java similarity index 78% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java index 5a66804dc..697383ef0 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractFieldInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.impl.IFeatureInstanceModelGroupAs; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.FieldReference; import java.math.BigInteger; import java.util.Map; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java similarity index 72% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java index 3a29e1b2c..a4ba125f9 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java @@ -3,37 +3,37 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.AbstractInlineAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained; -import gov.nist.secauto.metaschema.core.model.MetaschemaModelConstants; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.AbstractInlineAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IContainerModelAssemblySupport; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IModelConstrained; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java similarity index 77% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java index 6af05bcd3..54e11a39e 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractAssemblyInstance; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java similarity index 74% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java index 6c442aa33..b21de1495 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java @@ -3,33 +3,33 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelElementVisitor; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained; -import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractInlineFieldDefinition; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IValueConstrained; +import dev.metaschema.core.model.constraint.ValueConstraintSet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; +import dev.metaschema.databind.model.metaschema.binding.FieldConstraints; +import dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java similarity index 76% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java index daa8243e9..d01632648 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel; +package dev.metaschema.databind.model.metaschema.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.model.AbstractFieldInstance; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; +import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; +import dev.metaschema.databind.model.metaschema.IBindingInstance; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import java.util.Map; import java.util.Set; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java similarity index 83% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java index 3feb43174..57884e7bb 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java @@ -3,37 +3,37 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.MetapathConstants; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException; -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.type.DataTypeItemType; -import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType; -import gov.nist.secauto.metaschema.core.model.IAttributable; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IGroupable; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -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.model.IGroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupingAs; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.UseName; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.type.DataTypeItemType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IGroupable; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IGroupAs; +import dev.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.binding.GroupingAs; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName; +import dev.metaschema.databind.model.metaschema.binding.Property; +import dev.metaschema.databind.model.metaschema.binding.Remarks; +import dev.metaschema.databind.model.metaschema.binding.UseName; import java.math.BigInteger; import java.net.URI; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/package-info.java similarity index 75% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/package-info.java rename to databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/package-info.java index 84845669b..eea2d661d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/package-info.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/package-info.java @@ -8,4 +8,4 @@ * Metaschema module binding as a Metaschema module. */ -package gov.nist.secauto.metaschema.databind.model.metaschema.impl; +package dev.metaschema.databind.model.metaschema.impl; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/package-info.java new file mode 100644 index 000000000..d576037b9 --- /dev/null +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/package-info.java @@ -0,0 +1,13 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides an implementation of the Module model + * ({@link dev.metaschema.core.model}) represented by a module-specific set of + * bound Java classes + * ({@link dev.metaschema.databind.model.metaschema.binding}). + */ + +package dev.metaschema.databind.model.metaschema; diff --git a/databind/src/main/java/dev/metaschema/databind/model/package-info.java b/databind/src/main/java/dev/metaschema/databind/model/package-info.java new file mode 100644 index 000000000..e9c069752 --- /dev/null +++ b/databind/src/main/java/dev/metaschema/databind/model/package-info.java @@ -0,0 +1,13 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides an overlay of the Metaschema module model + * ({@link dev.metaschema.core.model}) using bound Java class annotations + * ({@link dev.metaschema.databind.model.annotations}) to represent module + * constructs annotated on Java classes. + */ + +package dev.metaschema.databind.model; diff --git a/databind/src/main/java/dev/metaschema/databind/package-info.java b/databind/src/main/java/dev/metaschema/databind/package-info.java new file mode 100644 index 000000000..684ee70c2 --- /dev/null +++ b/databind/src/main/java/dev/metaschema/databind/package-info.java @@ -0,0 +1,24 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Support for parsing Metaschema module-based data using Java class bindings. + *

      + * Two methods are supported + *

        + *
      1. A Java annotation based approach ({@link dev.metaschema.databind.model}) + * using annotations ({@link dev.metaschema.databind.model.annotations}). The + * {@link dev.metaschema.databind.DefaultBindingContext} is used to load a bound + * Java class. + *
      2. A metaschema-specific binding, based on the first method, that is capable + * of representing a Metaschema module + * ({@link dev.metaschema.databind.model.metaschema.binding}). The + * {@link dev.metaschema.databind.model.metaschema.BindingConstraintLoader} can + * be used to load any Metaschema module using this method. Once loaded, the + * module can be registered with the binding context. + *
      + */ + +package dev.metaschema.databind; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/package-info.java deleted file mode 100644 index a953f7512..000000000 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/config/binding/package-info.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ -// Generated from: ../../../../../../../../metaschema/metaschema-bindings.yaml -// Do not edit - changes will be lost when regenerated. -/** - * Provides generated Metaschema binding classes for module(s): Metaschema - * Binding Configuration. - *

      - * version 1.0.0 - *

      - * This module defines the binding configuration format used to customize Java - * code generation from Metaschema modules. It allows specifying package names, - * class names, interface implementations, base classes, and collection types - * for generated binding classes. - *

      - */ - -@gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { - gov.nist.secauto.metaschema.databind.config.binding.MetaschemaBindingsModule.class }) -@gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema( - namespace = "https://csrc.nist.gov/ns/metaschema-binding/1.0", - xmlns = { @gov.nist.secauto.metaschema.databind.model.annotations.XmlNs(prefix = "", - namespace = "https://csrc.nist.gov/ns/metaschema-binding/1.0") }, - xmlElementFormDefault = gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED) -package gov.nist.secauto.metaschema.databind.config.binding; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java deleted file mode 100644 index a1d028a61..000000000 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides an implementation of the Module model - * ({@link gov.nist.secauto.metaschema.core.model}) represented by bound Java - * class annotations - * ({@link gov.nist.secauto.metaschema.databind.model.annotations}). - */ - -package gov.nist.secauto.metaschema.databind.model.impl; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/package-info.java deleted file mode 100644 index 0f4703d31..000000000 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ -// Generated from: ../../../../../../../../../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml -// Do not edit - changes will be lost when regenerated. -/** - * Provides generated Metaschema binding classes for module(s): Metaschema - * Model. - *

      - * version 1.0.0-rc.1 - */ - -@gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { - gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModelModule.class }) -@gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema( - namespace = "http://csrc.nist.gov/ns/oscal/metaschema/1.0", - xmlns = { @gov.nist.secauto.metaschema.databind.model.annotations.XmlNs(prefix = "", - namespace = "http://csrc.nist.gov/ns/oscal/metaschema/1.0") }, - xmlElementFormDefault = gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED) -package gov.nist.secauto.metaschema.databind.model.metaschema.binding; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/package-info.java deleted file mode 100644 index a923d74ba..000000000 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/package-info.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides an implementation of the Module model - * ({@link gov.nist.secauto.metaschema.core.model}) represented by a - * module-specific set of bound Java classes - * ({@link gov.nist.secauto.metaschema.databind.model.metaschema.binding}). - */ - -package gov.nist.secauto.metaschema.databind.model.metaschema; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java deleted file mode 100644 index b55bf4d62..000000000 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides an overlay of the Metaschema module model - * ({@link gov.nist.secauto.metaschema.core.model}) using bound Java class - * annotations ({@link gov.nist.secauto.metaschema.databind.model.annotations}) - * to represent module constructs annotated on Java classes. - */ - -package gov.nist.secauto.metaschema.databind.model; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java deleted file mode 100644 index 736143740..000000000 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Support for parsing Metaschema module-based data using Java class bindings. - *

      - * Two methods are supported - *

        - *
      1. A Java annotation based approach - * ({@link gov.nist.secauto.metaschema.databind.model}) using annotations - * ({@link gov.nist.secauto.metaschema.databind.model.annotations}). The - * {@link gov.nist.secauto.metaschema.databind.DefaultBindingContext} is used to - * load a bound Java class. - *
      2. A metaschema-specific binding, based on the first method, that is capable - * of representing a Metaschema module - * ({@link gov.nist.secauto.metaschema.databind.model.metaschema.binding}). The - * {@link gov.nist.secauto.metaschema.databind.model.metaschema.BindingConstraintLoader} - * can be used to load any Metaschema module using this method. Once loaded, the - * module can be registered with the binding context. - *
      - */ - -package gov.nist.secauto.metaschema.databind; diff --git a/databind/src/main/java/module-info.java b/databind/src/main/java/module-info.java index 17720a776..a04c80f4c 100644 --- a/databind/src/main/java/module-info.java +++ b/databind/src/main/java/module-info.java @@ -6,12 +6,12 @@ /** * Identifies the modules used by the databind library. */ -module gov.nist.secauto.metaschema.databind { +module dev.metaschema.databind { // requirements requires java.base; requires java.compiler; - requires transitive gov.nist.secauto.metaschema.core; + requires transitive dev.metaschema.core; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; @@ -27,21 +27,21 @@ requires flexmark.util.sequence; - exports gov.nist.secauto.metaschema.databind; - exports gov.nist.secauto.metaschema.databind.codegen; - exports gov.nist.secauto.metaschema.databind.codegen.config; - exports gov.nist.secauto.metaschema.databind.config.binding; - // exports gov.nist.secauto.metaschema.databind.codegen.typeinfo; - exports gov.nist.secauto.metaschema.databind.io; - exports gov.nist.secauto.metaschema.databind.io.json; - exports gov.nist.secauto.metaschema.databind.io.xml; - exports gov.nist.secauto.metaschema.databind.io.yaml; - exports gov.nist.secauto.metaschema.databind.model; - exports gov.nist.secauto.metaschema.databind.model.info; - exports gov.nist.secauto.metaschema.databind.model.annotations; - exports gov.nist.secauto.metaschema.databind.model.metaschema; - exports gov.nist.secauto.metaschema.databind.model.metaschema.binding; + exports dev.metaschema.databind; + exports dev.metaschema.databind.codegen; + exports dev.metaschema.databind.codegen.config; + exports dev.metaschema.databind.config.binding; + // exports dev.metaschema.databind.codegen.typeinfo; + exports dev.metaschema.databind.io; + exports dev.metaschema.databind.io.json; + exports dev.metaschema.databind.io.xml; + exports dev.metaschema.databind.io.yaml; + exports dev.metaschema.databind.model; + exports dev.metaschema.databind.model.info; + exports dev.metaschema.databind.model.annotations; + exports dev.metaschema.databind.model.metaschema; + exports dev.metaschema.databind.model.metaschema.binding; // open binding classes for reflection - opens gov.nist.secauto.metaschema.databind.config.binding; + opens dev.metaschema.databind.config.binding; } diff --git a/databind/src/main/metaschema-bindings/metaschema-config-bindings.xml b/databind/src/main/metaschema-bindings/metaschema-config-bindings.xml index 7d1cb66a3..67af7b04e 100644 --- a/databind/src/main/metaschema-bindings/metaschema-config-bindings.xml +++ b/databind/src/main/metaschema-bindings/metaschema-config-bindings.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="https://csrc.nist.gov/ns/metaschema-binding/1.0 ../xsd/metaschema-binding.xsd"> - gov.nist.secauto.metaschema.databind.config.binding + dev.metaschema.databind.config.binding diff --git a/databind/src/main/metaschema-bindings/metaschema-model-bindings.xml b/databind/src/main/metaschema-bindings/metaschema-model-bindings.xml index 90e09d4b6..f07e89101 100644 --- a/databind/src/main/metaschema-bindings/metaschema-model-bindings.xml +++ b/databind/src/main/metaschema-bindings/metaschema-model-bindings.xml @@ -7,7 +7,7 @@ xmlns="https://csrc.nist.gov/ns/metaschema-binding/1.0"> - gov.nist.secauto.metaschema.databind.model.metaschema.binding + dev.metaschema.databind.model.metaschema.binding - gov.nist.secauto.metaschema.databind.model.metaschema.IModelConstraintsBase + dev.metaschema.databind.model.metaschema.IModelConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase + dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase + dev.metaschema.databind.model.metaschema.IConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase + dev.metaschema.databind.model.metaschema.IValueConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase + dev.metaschema.databind.model.metaschema.IConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase + dev.metaschema.databind.model.metaschema.IValueConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase + dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase + dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase + dev.metaschema.databind.model.metaschema.ITargetedConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase + dev.metaschema.databind.model.metaschema.IValueConstraintsBase - gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase + dev.metaschema.databind.model.metaschema.IConstraintBase - gov.nist.secauto.metaschema.databind.model.metaschema.impl.AbstractAllowedValue + dev.metaschema.databind.model.metaschema.impl.AbstractAllowedValue diff --git a/databind/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary b/databind/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary new file mode 100644 index 000000000..96921e8c0 --- /dev/null +++ b/databind/src/main/resources/META-INF/services/dev.metaschema.core.metapath.function.IFunctionLibrary @@ -0,0 +1 @@ +dev.metaschema.databind.metapath.function.DatabindFunctionLibrary diff --git a/databind/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary b/databind/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary deleted file mode 100644 index 05b03ef7e..000000000 --- a/databind/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary +++ /dev/null @@ -1 +0,0 @@ -gov.nist.secauto.metaschema.databind.metapath.function.DatabindFunctionLibrary diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/Examples.java b/databind/src/test/java/dev/metaschema/databind/Examples.java similarity index 89% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/Examples.java rename to databind/src/test/java/dev/metaschema/databind/Examples.java index 035dd5576..a5a1e1f30 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/Examples.java +++ b/databind/src/test/java/dev/metaschema/databind/Examples.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; -//import gov.nist.secauto.metaschema.databind.io.Format; -//import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -//import gov.nist.secauto.metaschema.databind.io.ISerializer; +//import dev.metaschema.databind.io.Format; +//import dev.metaschema.databind.io.IBoundLoader; +//import dev.metaschema.databind.io.ISerializer; // //import org.junit.jupiter.api.Test; // diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/FnDocTest.java b/databind/src/test/java/dev/metaschema/databind/FnDocTest.java similarity index 73% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/FnDocTest.java rename to databind/src/test/java/dev/metaschema/databind/FnDocTest.java index 65f9a3deb..bb31e48a8 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/FnDocTest.java +++ b/databind/src/test/java/dev/metaschema/databind/FnDocTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/IBindingContextTest.java b/databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java similarity index 63% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/IBindingContextTest.java rename to databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java index 55069276e..0a1df8066 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/IBindingContextTest.java +++ b/databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind; +package dev.metaschema.databind; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.databind.model.metaschema.BindingConstraintLoader; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.test.TestMetaschema; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.test.TestMetaschema; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java similarity index 93% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java index 0999fd26e..1843cfee4 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import static org.junit.jupiter.api.Assertions.assertAll; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IDeserializer; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java similarity index 90% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java index 704fc973d..7d9b3e325 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,19 +12,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -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.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.BindingException; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtilsTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java similarity index 98% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtilsTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java index fac5492fa..e7c8b63ce 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtilsTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.ObjectUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java similarity index 67% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java index 07be733c8..e02fca0e7 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/JavadocGenerationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java similarity index 97% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/JavadocGenerationTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java index 7ea79d811..ca42b8a15 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/JavadocGenerationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen; +package dev.metaschema.databind.codegen; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java similarity index 89% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java index b1e121991..8e7e57ab2 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; 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.BindingException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ void testConfiguredNamespace() { // test namespaces Map namespaceToPackageName = new HashMap<>(); namespaceToPackageName.put("http://csrc.nist.gov/ns/metaschema/testing/assembly", - "gov.nist.secauto.metaschema.testing.assembly"); + "dev.metaschema.testing.assembly"); for (Map.Entry entry : namespaceToPackageName.entrySet()) { config.addModelBindingConfig(entry.getKey(), entry.getValue()); diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java similarity index 97% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java index 8d3568b6f..d6154dd55 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,13 +11,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.ModelType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; @@ -340,7 +340,7 @@ void testChoiceGroupBindingParsing() throws IOException, BindingException { = defConfig.getChoiceGroupBindings().get("mixed-content"); assertNotNull(mixedContentConfig, "mixed-content choice group binding should exist"); assertEquals("mixed-content", mixedContentConfig.getGroupAsName()); - assertEquals("gov.nist.secauto.metaschema.core.model.IModelElement", + assertEquals("dev.metaschema.core.model.IModelElement", mixedContentConfig.getItemTypeName()); assertEquals(true, mixedContentConfig.isUseWildcard(), "mixed-content should use wildcard"); diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java similarity index 95% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java index d3edd82ce..19857405e 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.config; +package dev.metaschema.databind.codegen.config; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -12,11 +12,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.ModelType; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.BindingException; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java similarity index 76% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java index c8385b867..47c708617 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.impl; +package dev.metaschema.databind.codegen.impl; import com.squareup.javapoet.AnnotationSpec; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java similarity index 93% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java index e40b15336..08f59dd90 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java similarity index 95% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java index 95c0c93d6..2cf7ed308 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -14,14 +14,14 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.WildcardTypeName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; +import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java similarity index 95% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java rename to databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java index 4c4645a2b..29b59dd89 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.codegen.typeinfo; +package dev.metaschema.databind.codegen.typeinfo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import com.squareup.javapoet.ClassName; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; +import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ChoiceValidationTest.java b/databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java similarity index 93% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ChoiceValidationTest.java rename to databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java index e757fde77..3c255ca3d 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ChoiceValidationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java similarity index 67% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoaderTest.java rename to databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java index 17136bf5d..08018c968 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/FormatDetectorTest.java b/databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java similarity index 94% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/FormatDetectorTest.java rename to databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java index 60a041755..58cee33c8 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/FormatDetectorTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.databind.test.util.CloseDetectingInputStream; +import dev.metaschema.databind.test.util.CloseDetectingInputStream; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/FormatPathFormatterTest.java b/databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java similarity index 95% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/FormatPathFormatterTest.java rename to databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java index e455e1aa9..096d43e25 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/FormatPathFormatterTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertSame; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.format.PathFormatSelection; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.PathFormatSelection; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/Issue206MetaschemaReaderTest.java b/databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java similarity index 81% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/Issue206MetaschemaReaderTest.java rename to databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java index c3962f345..c09fef269 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/Issue206MetaschemaReaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java @@ -3,30 +3,30 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.json.JsonFactoryFactory; -import gov.nist.secauto.metaschema.databind.io.json.MetaschemaJsonReader; -import gov.nist.secauto.metaschema.databind.io.xml.MetaschemaXmlReader; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.json.JsonFactoryFactory; +import dev.metaschema.databind.io.json.MetaschemaJsonReader; +import dev.metaschema.databind.io.xml.MetaschemaXmlReader; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.databind.model.annotations.MetaschemaModule; import org.codehaus.stax2.XMLEventReader2; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java b/databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java similarity index 86% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java rename to databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java index e3ecd4fc9..bd76f2c09 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/RequiredFieldValidationTest.java b/databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java similarity index 95% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/RequiredFieldValidationTest.java rename to databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java index 26d3580f2..66781b5e9 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/RequiredFieldValidationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ValidationErrorMessageTest.java b/databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java similarity index 98% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ValidationErrorMessageTest.java rename to databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java index 0eaa95949..c56633aa9 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/ValidationErrorMessageTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io; +package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,11 +11,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Nested; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java b/databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java similarity index 73% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java rename to databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java index ba863c9ae..b653fec3b 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.json; +package dev.metaschema.databind.io.json; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.IBoundLoader; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java b/databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java similarity index 90% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java rename to databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java index b1335765c..26689d939 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.io.xml; +package dev.metaschema.databind.io.xml; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,15 +13,15 @@ import com.ctc.wstx.stax.WstxInputFactory; import com.fasterxml.jackson.core.JsonParseException; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField; -import gov.nist.secauto.metaschema.databind.model.test.FlaggedAssembly; -import gov.nist.secauto.metaschema.databind.model.test.MultiFieldAssembly; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.model.test.FlaggedAssembly; +import dev.metaschema.databind.model.test.MultiFieldAssembly; import org.codehaus.stax2.XMLEventReader2; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java b/databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java similarity index 88% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java rename to databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java index d04489d5a..ac2d945fe 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java +++ b/databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; -import gov.nist.secauto.metaschema.databind.model.test.RootBoundAssembly; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.databind.model.test.RootBoundAssembly; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java b/databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java similarity index 96% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java rename to databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java index c2aaa9a8a..312ee4c81 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; import static org.junit.jupiter.api.Assertions.assertNotNull; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.json.MetaschemaJsonReader; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.json.MetaschemaJsonReader; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java b/databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java similarity index 94% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java rename to databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java index 5870b8733..cda313c60 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -15,11 +15,11 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.json.MetaschemaJsonReader; -import gov.nist.secauto.metaschema.databind.model.test.MultiFieldAssembly; -import gov.nist.secauto.metaschema.databind.model.test.SimpleAssembly; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.json.MetaschemaJsonReader; +import dev.metaschema.databind.model.test.MultiFieldAssembly; +import dev.metaschema.databind.model.test.SimpleAssembly; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java b/databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java similarity index 70% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java rename to databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java index c6592e719..197383ba4 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model; +package dev.metaschema.databind.model; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java b/databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java similarity index 75% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java rename to databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java index 80d3c86a9..0adc54c39 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.extra; +package dev.metaschema.databind.model.extra; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/impl/BoundChoiceTest.java b/databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java similarity index 91% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/impl/BoundChoiceTest.java rename to databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java index 2fb610ea8..a28897fc3 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/impl/BoundChoiceTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoice; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.testing.model.TestModule; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.annotations.BoundChoice; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.testing.model.TestModule; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactoryTest.java b/databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java similarity index 79% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactoryTest.java rename to databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java index 29c602ccd..dcbefeb9a 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactoryTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.impl; +package dev.metaschema.databind.model.impl; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.constraint.ILet; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.Let; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.Let; import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java similarity index 93% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java rename to databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java index 798979517..075f77252 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java @@ -3,31 +3,31 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.ISource; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.IReportConstraint; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedReportConstraint; -import gov.nist.secauto.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.AssemblyConstraintSet; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.IReportConstraint; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints; +import dev.metaschema.databind.model.metaschema.binding.TargetedReportConstraint; +import dev.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport; import org.junit.jupiter.api.Test; @@ -172,14 +172,14 @@ void testTraceReportConstraintLoading() throws IOException { // Step 2: Check contexts trace.append("\nSTEP 2: Check parsed contexts\n"); - List contexts + List contexts = metaConstraints.getContexts(); trace.append(" Number of contexts: ").append(contexts.size()).append("\n"); assertFalse(contexts.isEmpty(), "Should have at least one context"); // Step 3: Check first context's constraints trace.append("\nSTEP 3: Check first context's constraints\n"); - gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathContext firstContext = contexts.get(0); + dev.metaschema.databind.model.metaschema.binding.MetapathContext firstContext = contexts.get(0); trace.append(" First context metapaths: "); for (var mp : firstContext.getMetapaths()) { trace.append(mp.getTarget()).append(" "); @@ -335,7 +335,7 @@ void testBindingConstraintLoaderReturnsReportConstraints() throws MetaschemaExce trace.append("Constraint set type: ").append(constraintSet.getClass().getName()).append("\n"); // For MetaConstraintSet, we need to check the contexts - if (constraintSet instanceof gov.nist.secauto.metaschema.core.model.constraint.MetaConstraintSet) { + if (constraintSet instanceof dev.metaschema.core.model.constraint.MetaConstraintSet) { trace.append("MetaConstraintSet detected - need to check contexts\n"); // Can't directly access contexts, but we can test the behavior } diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java similarity index 67% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java rename to databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java index b90c4f9ec..f952fa122 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.metaschema; +package dev.metaschema.databind.model.metaschema; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java b/databind/src/test/java/dev/metaschema/databind/model/test/DefaultValueKeyField.java similarity index 65% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java rename to databind/src/test/java/dev/metaschema/databind/model/test/DefaultValueKeyField.java index 6dc3bcf6a..7a0e45863 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/DefaultValueKeyField.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.MetaschemaField; @SuppressWarnings("PMD") @MetaschemaField( diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/EmptyBoundAssembly.java similarity index 67% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/EmptyBoundAssembly.java index c989037d4..a74c47f42 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/EmptyBoundAssembly.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; @MetaschemaAssembly(name = "empty-bound-assembly", rootName = "root", moduleClass = TestMetaschema.class) public class EmptyBoundAssembly implements IBoundObject { diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java similarity index 70% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java index b0d51b092..f1a6dab8b 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.core.datatype.adapter.IntegerAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import java.math.BigInteger; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedBoundAssembly.java similarity index 61% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/FlaggedBoundAssembly.java index 304b75a1d..7df1d9ac1 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedBoundAssembly.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; - -import gov.nist.secauto.metaschema.core.datatype.adapter.BooleanAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +package dev.metaschema.databind.model.test; + +import dev.metaschema.core.datatype.adapter.BooleanAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.JsonKey; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; @MetaschemaAssembly(name = "flagged-bound-assembly", moduleClass = TestMetaschema.class) public class FlaggedBoundAssembly implements IBoundObject { diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedBoundField.java similarity index 58% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java rename to databind/src/test/java/dev/metaschema/databind/model/test/FlaggedBoundField.java index 16867d2b6..b54de0b12 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedBoundField.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; - -import gov.nist.secauto.metaschema.core.datatype.adapter.BooleanAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; +package dev.metaschema.databind.model.test; + +import dev.metaschema.core.datatype.adapter.BooleanAdapter; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.JsonKey; +import dev.metaschema.databind.model.annotations.MetaschemaField; @MetaschemaField(name = "flagged-bound-field", moduleClass = TestMetaschema.class) public class FlaggedBoundField implements IBoundObject { diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java similarity index 78% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java index 1912b2477..7689857d0 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; +package dev.metaschema.databind.model.test; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; import java.util.List; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java similarity index 88% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java index 13b5e2bbb..354aae4bb 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +package dev.metaschema.databind.model.test; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import java.util.List; import java.util.Map; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java similarity index 69% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java index a86285d4f..f8f8ee278 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -import gov.nist.secauto.metaschema.core.datatype.adapter.UuidAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.core.datatype.adapter.UuidAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import java.util.List; import java.util.Map; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java similarity index 67% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java rename to databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java index b638b8956..72a703843 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.core.datatype.adapter.IntegerAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import java.math.BigInteger; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java b/databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java similarity index 75% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java rename to databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java index 1c9a52244..05c3aaf08 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -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.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; +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.databind.IBindingContext; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaModule; import java.net.URI; import java.util.List; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java b/databind/src/test/java/dev/metaschema/databind/model/test/ValueKeyField.java similarity index 66% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java rename to databind/src/test/java/dev/metaschema/databind/model/test/ValueKeyField.java index 8c3bb16a8..a3488efff 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/ValueKeyField.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.model.test; +package dev.metaschema.databind.model.test; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.MetaschemaField; @SuppressWarnings("PMD") @MetaschemaField( diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/package-info.java b/databind/src/test/java/dev/metaschema/databind/model/test/package-info.java new file mode 100644 index 000000000..b52a1477e --- /dev/null +++ b/databind/src/test/java/dev/metaschema/databind/model/test/package-info.java @@ -0,0 +1,15 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +@XmlSchema( + namespace = "http://example.org/ns/test", + xmlns = { @XmlNs(prefix = "", + namespace = "http://example.org/ns/test") }, + xmlElementFormDefault = XmlNsForm.QUALIFIED) +package dev.metaschema.databind.model.test; + +import dev.metaschema.databind.model.annotations.XmlNs; +import dev.metaschema.databind.model.annotations.XmlNsForm; +import dev.metaschema.databind.model.annotations.XmlSchema; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/test/util/CloseDetectingInputStream.java b/databind/src/test/java/dev/metaschema/databind/test/util/CloseDetectingInputStream.java similarity index 98% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/test/util/CloseDetectingInputStream.java rename to databind/src/test/java/dev/metaschema/databind/test/util/CloseDetectingInputStream.java index f78b447ce..0b5a89dd4 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/test/util/CloseDetectingInputStream.java +++ b/databind/src/test/java/dev/metaschema/databind/test/util/CloseDetectingInputStream.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.test.util; +package dev.metaschema.databind.test.util; import org.eclipse.jdt.annotation.Owning; diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/package-info.java b/databind/src/test/java/dev/metaschema/databind/test/util/package-info.java similarity index 54% rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/package-info.java rename to databind/src/test/java/dev/metaschema/databind/test/util/package-info.java index e0b885170..86c8db422 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/package-info.java +++ b/databind/src/test/java/dev/metaschema/databind/test/util/package-info.java @@ -3,4 +3,4 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.metapath.function; +package dev.metaschema.databind.test.util; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java similarity index 97% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java rename to databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java index 5f30d4c02..6bcc2fdbf 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.testing.model; +package dev.metaschema.databind.testing.model; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,17 +12,17 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -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.Format; -import gov.nist.secauto.metaschema.databind.io.IDeserializer; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField; -import gov.nist.secauto.metaschema.databind.testing.model.RootAssemblyWithFields.JsonKeyField; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.testing.model.RootAssemblyWithFields.JsonKeyField; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java similarity index 90% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java rename to databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java index 266fc5c43..fa9782d64 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.testing.model; +package dev.metaschema.databind.testing.model; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag; -import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ModelUtil; import java.lang.reflect.Field; import java.util.Optional; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java similarity index 91% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java rename to databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java index fb5f4068c..d06059625 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.testing.model; - -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundField; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField; +package dev.metaschema.databind.testing.model; + +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.databind.model.annotations.BoundField; +import dev.metaschema.databind.model.annotations.BoundFieldValue; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; +import dev.metaschema.databind.model.annotations.JsonKey; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.MetaschemaField; import java.util.List; import java.util.Map; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java similarity index 84% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java rename to databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java index e6fc034a8..512c2905b 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.testing.model; +package dev.metaschema.databind.testing.model; -import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.core.datatype.adapter.IntegerAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import java.math.BigInteger; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/TestModule.java b/databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java similarity index 73% rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/TestModule.java rename to databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java index 3fff814ba..a31974a4a 100644 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/TestModule.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.databind.testing.model; +package dev.metaschema.databind.testing.model; -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.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; +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.databind.IBindingContext; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaModule; import java.net.URI; import java.util.List; diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/package-info.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/package-info.java deleted file mode 100644 index 8811abd4e..000000000 --- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/package-info.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -@XmlSchema( - namespace = "http://example.org/ns/test", - xmlns = { @XmlNs(prefix = "", - namespace = "http://example.org/ns/test") }, - xmlElementFormDefault = XmlNsForm.QUALIFIED) -package gov.nist.secauto.metaschema.databind.model.test; - -import gov.nist.secauto.metaschema.databind.model.annotations.XmlNs; -import gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm; -import gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema; diff --git a/databind/src/test/resources/log4j2-test.xml b/databind/src/test/resources/log4j2-test.xml index 2999d73e4..8e1c99c72 100644 --- a/databind/src/test/resources/log4j2-test.xml +++ b/databind/src/test/resources/log4j2-test.xml @@ -10,7 +10,7 @@ - + diff --git a/databind/src/test/resources/metaschema/binding-config-with-choice-groups.xml b/databind/src/test/resources/metaschema/binding-config-with-choice-groups.xml index 770c93291..6dc036b33 100644 --- a/databind/src/test/resources/metaschema/binding-config-with-choice-groups.xml +++ b/databind/src/test/resources/metaschema/binding-config-with-choice-groups.xml @@ -14,7 +14,7 @@ - gov.nist.secauto.metaschema.core.model.IModelElement + dev.metaschema.core.model.IModelElement diff --git a/metaschema-cli/.settings/org.eclipse.jdt.apt.core.prefs b/metaschema-cli/.settings/org.eclipse.jdt.apt.core.prefs index 775dae91e..eb9e0b308 100644 --- a/metaschema-cli/.settings/org.eclipse.jdt.apt.core.prefs +++ b/metaschema-cli/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false -org.eclipse.jdt.apt.reconcileEnabled=false +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/metaschema-cli/.settings/org.eclipse.jdt.core.prefs b/metaschema-cli/.settings/org.eclipse.jdt.core.prefs index d5c6a182f..3d703be57 100644 --- a/metaschema-cli/.settings/org.eclipse.jdt.core.prefs +++ b/metaschema-cli/.settings/org.eclipse.jdt.core.prefs @@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false diff --git a/metaschema-cli/pom.xml b/metaschema-cli/pom.xml index f48dca953..e277beed1 100644 --- a/metaschema-cli/pom.xml +++ b/metaschema-cli/pom.xml @@ -87,7 +87,7 @@ - gov.nist.secauto.metaschema.cli.CLI + dev.metaschema.cli.CLI metaschema-cli @@ -129,7 +129,7 @@ - gov.nist.secauto.metaschema.cli.CLI + dev.metaschema.cli.CLI true custom diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java b/metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java similarity index 74% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java index 70a4307e5..0a8eafb3f 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli; +package dev.metaschema.cli; -import gov.nist.secauto.metaschema.cli.commands.MetaschemaCommands; -import gov.nist.secauto.metaschema.cli.processor.CLIProcessor; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; -import gov.nist.secauto.metaschema.cli.processor.command.CommandService; -import gov.nist.secauto.metaschema.cli.processor.completion.CompletionTypeRegistry; -import gov.nist.secauto.metaschema.core.MetaschemaConstants; -import gov.nist.secauto.metaschema.core.MetaschemaJavaVersion; -import gov.nist.secauto.metaschema.core.metapath.format.PathFormatSelection; -import gov.nist.secauto.metaschema.core.model.MetaschemaVersion; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat; +import dev.metaschema.cli.commands.MetaschemaCommands; +import dev.metaschema.cli.processor.CLIProcessor; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.cli.processor.command.CommandService; +import dev.metaschema.cli.processor.completion.CompletionTypeRegistry; +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.MetaschemaJavaVersion; +import dev.metaschema.core.metapath.format.PathFormatSelection; +import dev.metaschema.core.model.MetaschemaVersion; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.databind.io.Format; +import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; import java.io.PrintStream; import java.util.LinkedHashMap; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java similarity index 87% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java index 84ce28428..175d59f89 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractCommandExecutor; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractCommandExecutor; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java similarity index 88% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java index ba4cdbd7f..ded159962 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java @@ -3,35 +3,35 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CLIProcessor; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractCommandExecutor; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.util.LoggingValidationHandler; -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.metapath.format.PathFormatSelection; -import gov.nist.secauto.metaschema.core.model.IModule; -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.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.constraint.ValidationFeature; -import gov.nist.secauto.metaschema.core.model.validation.AggregateValidationResult; -import gov.nist.secauto.metaschema.core.model.validation.IValidationResult; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; -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.io.IBoundLoader; -import gov.nist.secauto.metaschema.modules.sarif.SarifValidationHandler; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CLIProcessor; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractCommandExecutor; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.util.LoggingValidationHandler; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.PathFormatSelection; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.ValidationFeature; +import dev.metaschema.core.model.validation.AggregateValidationResult; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.util.IVersionInfo; +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.io.IBoundLoader; +import dev.metaschema.modules.sarif.SarifValidationHandler; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java similarity index 78% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java index 46888ece5..103922d24 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ConvertContentUsingModuleCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.FormatDetector; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.io.IDeserializer; -import gov.nist.secauto.metaschema.databind.io.ISerializer; -import gov.nist.secauto.metaschema.databind.io.ModelDetector; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.FormatDetector; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.IDeserializer; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.io.ModelDetector; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateDiagramCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java similarity index 85% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateDiagramCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java index cd5568562..3afd826a0 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateDiagramCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.util.MermaidErDiagramGenerator; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.util.MermaidErDiagramGenerator; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java similarity index 82% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java index c97513aec..eb21c23f6 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -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.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.schemagen.ISchemaGenerator; +import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; +import dev.metaschema.schemagen.SchemaGenerationFeature; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java similarity index 93% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java index 039e0e93a..7107edb7d 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; +package dev.metaschema.cli.commands; -import gov.nist.secauto.metaschema.cli.commands.metapath.MetapathCommand; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.OptionUtils; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; -import gov.nist.secauto.metaschema.core.metapath.MetapathException; -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.CustomCollectors; -import gov.nist.secauto.metaschema.core.util.DeleteOnShutdown; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.UriUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat; +import dev.metaschema.cli.commands.metapath.MetapathCommand; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.OptionUtils; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.DeleteOnShutdown; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java similarity index 77% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java index 53872ec46..111f31070 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -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.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -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.schemagen.ISchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator.SchemaFormat; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; +import dev.metaschema.schemagen.ISchemaGenerator; +import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; +import dev.metaschema.schemagen.SchemaGenerationFeature; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java similarity index 77% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java index ae6377f9a..69c486c0f 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateModuleCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -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.model.metaschema.binding.MetaschemaModelModule; +package dev.metaschema.cli.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; import org.apache.commons.cli.CommandLine; import org.json.JSONObject; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java similarity index 83% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java index e3c918810..2d50c0f6e 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java @@ -3,29 +3,29 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands.metapath; - -import gov.nist.secauto.metaschema.cli.commands.MetaschemaCommands; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.DefaultItemWriter; -import gov.nist.secauto.metaschema.core.metapath.item.IItemWriter; -import gov.nist.secauto.metaschema.core.metapath.item.ISequence; -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.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; +package dev.metaschema.cli.commands.metapath; + +import dev.metaschema.cli.commands.MetaschemaCommands; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.DefaultItemWriter; +import dev.metaschema.core.metapath.item.IItemWriter; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.IBoundLoader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java similarity index 84% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java index eb07e00b9..a7a6a0ca1 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands.metapath; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.metapath.function.FunctionService; -import gov.nist.secauto.metaschema.core.metapath.function.IArgument; -import gov.nist.secauto.metaschema.core.metapath.function.IFunction; -import gov.nist.secauto.metaschema.core.qname.WellKnown; +package dev.metaschema.cli.commands.metapath; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.metapath.function.FunctionService; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.qname.WellKnown; import org.apache.commons.cli.CommandLine; import org.apache.logging.log4j.LogManager; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/MetapathCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/MetapathCommand.java similarity index 82% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/MetapathCommand.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/MetapathCommand.java index dc3155147..6bfb3db4f 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/MetapathCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/MetapathCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands.metapath; +package dev.metaschema.cli.commands.metapath; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * This sub-command implementation contains all command that relate to Metapath diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/package-info.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/package-info.java similarity index 78% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/package-info.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/package-info.java index b2ebd62cd..2bb40213b 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/package-info.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/package-info.java @@ -8,4 +8,4 @@ * process Metaschema Metapath-based information. */ -package gov.nist.secauto.metaschema.cli.commands.metapath; +package dev.metaschema.cli.commands.metapath; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/package-info.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/package-info.java similarity index 81% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/package-info.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/commands/package-info.java index 2ab2813bd..7c2efe8d6 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/package-info.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/package-info.java @@ -8,4 +8,4 @@ * commands that process Metaschema module-based information. */ -package gov.nist.secauto.metaschema.cli.commands; +package dev.metaschema.cli.commands; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java b/metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java similarity index 90% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java index 53d4ff152..5a842a106 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.util; +package dev.metaschema.cli.util; import static org.jline.jansi.Ansi.ansi; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; -import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationFinding; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level; -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.JsonSchemaContentValidator.JsonValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import gov.nist.secauto.metaschema.modules.sarif.SarifValidationHandler; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.AbstractValidationResultProcessor; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.modules.sarif.SarifValidationHandler; import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/package-info.java b/metaschema-cli/src/main/java/dev/metaschema/cli/util/package-info.java similarity index 78% rename from metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/package-info.java rename to metaschema-cli/src/main/java/dev/metaschema/cli/util/package-info.java index 435a2d2d8..930129948 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/package-info.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/util/package-info.java @@ -8,4 +8,4 @@ * commands. */ -package gov.nist.secauto.metaschema.cli.util; +package dev.metaschema.cli.util; diff --git a/metaschema-cli/src/main/java/module-info.java b/metaschema-cli/src/main/java/module-info.java index 2e314d2be..7e348b101 100644 --- a/metaschema-cli/src/main/java/module-info.java +++ b/metaschema-cli/src/main/java/module-info.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -import gov.nist.secauto.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommand; /** * Provides a command-line interface for Metaschema operations including schema @@ -11,15 +11,15 @@ * * @provides ICommand for CLI command discovery */ -module gov.nist.secauto.metaschema.cli { +module dev.metaschema.cli { // requirements requires java.base; - requires transitive gov.nist.secauto.metaschema.core; - requires transitive gov.nist.secauto.metaschema.databind; - requires transitive gov.nist.secauto.metaschema.schemagen; - requires transitive gov.nist.secauto.metaschema.cli.processor; - requires gov.nist.secauto.metaschema.databind.modules; + requires transitive dev.metaschema.core; + requires transitive dev.metaschema.databind; + requires transitive dev.metaschema.schemagen; + requires transitive dev.metaschema.cli.processor; + requires dev.metaschema.databind.modules; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; @@ -29,16 +29,16 @@ requires org.apache.logging.log4j; requires org.apache.logging.log4j.core; - exports gov.nist.secauto.metaschema.cli; - exports gov.nist.secauto.metaschema.cli.commands; - exports gov.nist.secauto.metaschema.cli.commands.metapath; - exports gov.nist.secauto.metaschema.cli.util; + exports dev.metaschema.cli; + exports dev.metaschema.cli.commands; + exports dev.metaschema.cli.commands.metapath; + exports dev.metaschema.cli.util; provides ICommand with - gov.nist.secauto.metaschema.cli.commands.ValidateModuleCommand, - gov.nist.secauto.metaschema.cli.commands.GenerateSchemaCommand, - gov.nist.secauto.metaschema.cli.commands.GenerateDiagramCommand, - gov.nist.secauto.metaschema.cli.commands.ValidateContentUsingModuleCommand, - gov.nist.secauto.metaschema.cli.commands.ConvertContentUsingModuleCommand, - gov.nist.secauto.metaschema.cli.commands.metapath.MetapathCommand; + dev.metaschema.cli.commands.ValidateModuleCommand, + dev.metaschema.cli.commands.GenerateSchemaCommand, + dev.metaschema.cli.commands.GenerateDiagramCommand, + dev.metaschema.cli.commands.ValidateContentUsingModuleCommand, + dev.metaschema.cli.commands.ConvertContentUsingModuleCommand, + dev.metaschema.cli.commands.metapath.MetapathCommand; } diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java similarity index 98% rename from metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java rename to metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java index 2c9096527..315ae4abf 100644 --- a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java +++ b/metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli; +package dev.metaschema.cli; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java b/metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java similarity index 91% rename from metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java rename to metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java index 5f7a93a2d..dc39cbcbb 100644 --- a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java +++ b/metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.commands.metapath; +package dev.metaschema.cli.commands.metapath; import static org.assertj.core.api.Assertions.assertThat; -import gov.nist.secauto.metaschema.cli.CLI; +import dev.metaschema.cli.CLI; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandlerTest.java b/metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java similarity index 96% rename from metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandlerTest.java rename to metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java index db3230336..b3769dda6 100644 --- a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandlerTest.java +++ b/metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.cli.util; +package dev.metaschema.cli.util; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.IPathFormatter; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -20,7 +20,7 @@ *

      * These tests verify the handler creation API that must be preserved when * migrating from Jansi to JLine. The actual ANSI output behavior is tested - * through integration tests in {@link gov.nist.secauto.metaschema.cli.CLITest}. + * through integration tests in {@link dev.metaschema.cli.CLITest}. */ class LoggingValidationHandlerTest { diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/AbstractDocumentationGenerator.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/AbstractDocumentationGenerator.java similarity index 80% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/AbstractDocumentationGenerator.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/AbstractDocumentationGenerator.java index 8b7bc3935..0de8261f9 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/AbstractDocumentationGenerator.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/AbstractDocumentationGenerator.java @@ -1,12 +1,12 @@ -package gov.nist.secauto.metaschema.docsgen; +package dev.metaschema.docsgen; -import gov.nist.secauto.metaschema.freemarker.support.AbstractFreemarkerGenerator; -import gov.nist.secauto.metaschema.model.common.IAssemblyDefinition; -import gov.nist.secauto.metaschema.model.common.IDefinition; -import gov.nist.secauto.metaschema.model.common.IMetaschema; -import gov.nist.secauto.metaschema.model.common.UsedDefinitionModelWalker; +import dev.metaschema.freemarker.support.AbstractFreemarkerGenerator; +import dev.metaschema.model.common.IAssemblyDefinition; +import dev.metaschema.model.common.IDefinition; +import dev.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.UsedDefinitionModelWalker; import java.io.IOException; import java.util.Collection; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/AbstractExplodedModelFreemarkerGenerator.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/AbstractExplodedModelFreemarkerGenerator.java similarity index 70% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/AbstractExplodedModelFreemarkerGenerator.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/AbstractExplodedModelFreemarkerGenerator.java index edcd45c56..4c0e6dc1f 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/AbstractExplodedModelFreemarkerGenerator.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/AbstractExplodedModelFreemarkerGenerator.java @@ -1,13 +1,13 @@ -package gov.nist.secauto.metaschema.docsgen; - -import gov.nist.secauto.metaschema.docsgen.explode.ExplosionVisitor; -import gov.nist.secauto.metaschema.docsgen.explode.IAssemblyModelElement; -import gov.nist.secauto.metaschema.freemarker.support.AbstractFreemarkerGenerator; -import gov.nist.secauto.metaschema.model.common.IMetaschema; -import gov.nist.secauto.metaschema.model.common.metapath.DynamicContext; -import gov.nist.secauto.metaschema.model.common.metapath.StaticContext; -import gov.nist.secauto.metaschema.model.common.metapath.item.INodeItemFactory; +package dev.metaschema.docsgen; + +import dev.metaschema.docsgen.explode.ExplosionVisitor; +import dev.metaschema.docsgen.explode.IAssemblyModelElement; +import dev.metaschema.freemarker.support.AbstractFreemarkerGenerator; +import dev.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.metapath.DynamicContext; +import dev.metaschema.model.common.metapath.StaticContext; +import dev.metaschema.model.common.metapath.item.INodeItemFactory; import java.io.IOException; import java.util.List; diff --git a/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/DocumentationGenerator.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/DocumentationGenerator.java new file mode 100644 index 000000000..a50b76212 --- /dev/null +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/DocumentationGenerator.java @@ -0,0 +1,9 @@ + + +package dev.metaschema.docsgen; + +import dev.metaschema.freemarker.support.IFreemarkerGenerator; + +// TODO: complete this implementation +public interface DocumentationGenerator extends IFreemarkerGenerator { +} diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/XmlOutlineDocumentationGenerator.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/XmlOutlineDocumentationGenerator.java similarity index 92% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/XmlOutlineDocumentationGenerator.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/XmlOutlineDocumentationGenerator.java index 71082b7d4..d8386d99a 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/XmlOutlineDocumentationGenerator.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/XmlOutlineDocumentationGenerator.java @@ -1,6 +1,6 @@ -package gov.nist.secauto.metaschema.docsgen; +package dev.metaschema.docsgen; import java.io.IOException; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/XmlReferenceDocumentationGenerator.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/XmlReferenceDocumentationGenerator.java similarity index 90% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/XmlReferenceDocumentationGenerator.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/XmlReferenceDocumentationGenerator.java index 7e33dc646..28cdf844c 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/XmlReferenceDocumentationGenerator.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/XmlReferenceDocumentationGenerator.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.docsgen; +package dev.metaschema.docsgen; -import gov.nist.secauto.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.IMetaschema; import java.io.IOException; import java.util.Map; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/AbstractModelElement.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/AbstractModelElement.java similarity index 88% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/AbstractModelElement.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/AbstractModelElement.java index 8687443df..007dc7fe1 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/AbstractModelElement.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/AbstractModelElement.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; -import gov.nist.secauto.metaschema.model.common.constraint.IConstraint; -import gov.nist.secauto.metaschema.model.common.metapath.item.IDefinitionNodeItem; +import dev.metaschema.model.common.constraint.IConstraint; +import dev.metaschema.model.common.metapath.item.IDefinitionNodeItem; import java.util.LinkedHashSet; import java.util.LinkedList; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/AssemblyModelElementImpl.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/AssemblyModelElementImpl.java similarity index 73% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/AssemblyModelElementImpl.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/AssemblyModelElementImpl.java index b2164dcce..fa5fb1d2b 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/AssemblyModelElementImpl.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/AssemblyModelElementImpl.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; -import gov.nist.secauto.metaschema.model.common.IAssemblyDefinition; -import gov.nist.secauto.metaschema.model.common.IAssemblyInstance; -import gov.nist.secauto.metaschema.model.common.metapath.item.IAssemblyNodeItem; +import dev.metaschema.model.common.IAssemblyDefinition; +import dev.metaschema.model.common.IAssemblyInstance; +import dev.metaschema.model.common.metapath.item.IAssemblyNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/ExplosionVisitor.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/ExplosionVisitor.java similarity index 78% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/ExplosionVisitor.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/ExplosionVisitor.java index ae9b5229f..2e72e3c26 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/ExplosionVisitor.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/ExplosionVisitor.java @@ -1,21 +1,21 @@ -package gov.nist.secauto.metaschema.docsgen.explode; - -import gov.nist.secauto.metaschema.model.common.constraint.IConstraint; -import gov.nist.secauto.metaschema.model.common.metapath.DynamicContext; -import gov.nist.secauto.metaschema.model.common.metapath.ISequence; -import gov.nist.secauto.metaschema.model.common.metapath.StaticContext; -import gov.nist.secauto.metaschema.model.common.metapath.item.IAssemblyNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.ICycledAssemblyNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IDocumentNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IFieldNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IFlagNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IMetaschemaNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IModelNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.INodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.INodeItemVisitable; -import gov.nist.secauto.metaschema.model.common.metapath.item.INodeItemVisitor; +package dev.metaschema.docsgen.explode; + +import dev.metaschema.model.common.constraint.IConstraint; +import dev.metaschema.model.common.metapath.DynamicContext; +import dev.metaschema.model.common.metapath.ISequence; +import dev.metaschema.model.common.metapath.StaticContext; +import dev.metaschema.model.common.metapath.item.IAssemblyNodeItem; +import dev.metaschema.model.common.metapath.item.ICycledAssemblyNodeItem; +import dev.metaschema.model.common.metapath.item.IDefinitionNodeItem; +import dev.metaschema.model.common.metapath.item.IDocumentNodeItem; +import dev.metaschema.model.common.metapath.item.IFieldNodeItem; +import dev.metaschema.model.common.metapath.item.IFlagNodeItem; +import dev.metaschema.model.common.metapath.item.IMetaschemaNodeItem; +import dev.metaschema.model.common.metapath.item.IModelNodeItem; +import dev.metaschema.model.common.metapath.item.INodeItem; +import dev.metaschema.model.common.metapath.item.INodeItemVisitable; +import dev.metaschema.model.common.metapath.item.INodeItemVisitor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/FieldModelElementImpl.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/FieldModelElementImpl.java similarity index 71% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/FieldModelElementImpl.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/FieldModelElementImpl.java index 808b38a5e..e58196b09 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/FieldModelElementImpl.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/FieldModelElementImpl.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; -import gov.nist.secauto.metaschema.model.common.IFieldDefinition; -import gov.nist.secauto.metaschema.model.common.IFieldInstance; -import gov.nist.secauto.metaschema.model.common.metapath.item.IFieldNodeItem; +import dev.metaschema.model.common.IFieldDefinition; +import dev.metaschema.model.common.IFieldInstance; +import dev.metaschema.model.common.metapath.item.IFieldNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/FlagModelElementImpl.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/FlagModelElementImpl.java similarity index 71% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/FlagModelElementImpl.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/FlagModelElementImpl.java index 717883fb7..5c2142abc 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/FlagModelElementImpl.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/FlagModelElementImpl.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; -import gov.nist.secauto.metaschema.model.common.IFlagDefinition; -import gov.nist.secauto.metaschema.model.common.IFlagInstance; -import gov.nist.secauto.metaschema.model.common.metapath.item.IFlagNodeItem; +import dev.metaschema.model.common.IFlagDefinition; +import dev.metaschema.model.common.IFlagInstance; +import dev.metaschema.model.common.metapath.item.IFlagNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IAssemblyModelElement.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IAssemblyModelElement.java similarity index 54% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IAssemblyModelElement.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IAssemblyModelElement.java index 763e09fcf..f994588c8 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IAssemblyModelElement.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IAssemblyModelElement.java @@ -1,9 +1,9 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; -import gov.nist.secauto.metaschema.model.common.IAssemblyDefinition; -import gov.nist.secauto.metaschema.model.common.IAssemblyInstance; -import gov.nist.secauto.metaschema.model.common.metapath.item.IAssemblyNodeItem; +import dev.metaschema.model.common.IAssemblyDefinition; +import dev.metaschema.model.common.IAssemblyInstance; +import dev.metaschema.model.common.metapath.item.IAssemblyNodeItem; /** * A marker interface that identifies a Metaschema construct as part of an assembly definition's model. diff --git a/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IFieldModelElement.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IFieldModelElement.java new file mode 100644 index 000000000..3283d2adc --- /dev/null +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IFieldModelElement.java @@ -0,0 +1,16 @@ +package dev.metaschema.docsgen.explode; + +import dev.metaschema.model.common.IFieldDefinition; +import dev.metaschema.model.common.IFieldInstance; +import dev.metaschema.model.common.metapath.item.IFieldNodeItem; + +public interface IFieldModelElement extends IModelElement { + @Override + IFieldNodeItem getNodeItem(); + + @Override + IFieldDefinition getDefinition(); + + @Override + IFieldInstance getInstance(); +} diff --git a/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IFlagModelElement.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IFlagModelElement.java new file mode 100644 index 000000000..4b9dffb9c --- /dev/null +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IFlagModelElement.java @@ -0,0 +1,16 @@ +package dev.metaschema.docsgen.explode; + +import dev.metaschema.model.common.IFlagDefinition; +import dev.metaschema.model.common.IFlagInstance; +import dev.metaschema.model.common.metapath.item.IFlagNodeItem; + +public interface IFlagModelElement extends IModelElement { + @Override + IFlagNodeItem getNodeItem(); + + @Override + IFlagDefinition getDefinition(); + + @Override + IFlagInstance getInstance(); +} diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IModelElement.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IModelElement.java similarity index 60% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IModelElement.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IModelElement.java index ad945b3f3..0630a5605 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IModelElement.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IModelElement.java @@ -1,11 +1,11 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; -import gov.nist.secauto.metaschema.docsgen.explode.IModelElementVisitor.IModelElementVisitable; -import gov.nist.secauto.metaschema.model.common.IDefinition; -import gov.nist.secauto.metaschema.model.common.INamedInstance; -import gov.nist.secauto.metaschema.model.common.constraint.IConstraint; -import gov.nist.secauto.metaschema.model.common.metapath.item.IDefinitionNodeItem; +import dev.metaschema.docsgen.explode.IModelElementVisitor.IModelElementVisitable; +import dev.metaschema.model.common.IDefinition; +import dev.metaschema.model.common.INamedInstance; +import dev.metaschema.model.common.constraint.IConstraint; +import dev.metaschema.model.common.metapath.item.IDefinitionNodeItem; import java.util.List; import java.util.Set; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IModelElementVisitor.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IModelElementVisitor.java similarity index 90% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IModelElementVisitor.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IModelElementVisitor.java index 5bdae4f97..a154eb29e 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IModelElementVisitor.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IModelElementVisitor.java @@ -1,5 +1,5 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IMutableModelElement.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IMutableModelElement.java similarity index 79% rename from metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IMutableModelElement.java rename to metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IMutableModelElement.java index 2e5f3e218..8428b5627 100644 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IMutableModelElement.java +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/IMutableModelElement.java @@ -1,4 +1,4 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/package-info.java b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/package-info.java new file mode 100644 index 000000000..951a20991 --- /dev/null +++ b/metaschema-documentation-generator/src/main/java/dev/metaschema/docsgen/explode/package-info.java @@ -0,0 +1,2 @@ + +package dev.metaschema.docsgen.explode; \ No newline at end of file diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/DocumentationGenerator.java b/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/DocumentationGenerator.java deleted file mode 100644 index 595263187..000000000 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/DocumentationGenerator.java +++ /dev/null @@ -1,9 +0,0 @@ - - -package gov.nist.secauto.metaschema.docsgen; - -import gov.nist.secauto.metaschema.freemarker.support.IFreemarkerGenerator; - -// TODO: complete this implementation -public interface DocumentationGenerator extends IFreemarkerGenerator { -} diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IFieldModelElement.java b/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IFieldModelElement.java deleted file mode 100644 index 52ba19f64..000000000 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IFieldModelElement.java +++ /dev/null @@ -1,16 +0,0 @@ -package gov.nist.secauto.metaschema.docsgen.explode; - -import gov.nist.secauto.metaschema.model.common.IFieldDefinition; -import gov.nist.secauto.metaschema.model.common.IFieldInstance; -import gov.nist.secauto.metaschema.model.common.metapath.item.IFieldNodeItem; - -public interface IFieldModelElement extends IModelElement { - @Override - IFieldNodeItem getNodeItem(); - - @Override - IFieldDefinition getDefinition(); - - @Override - IFieldInstance getInstance(); -} diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IFlagModelElement.java b/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IFlagModelElement.java deleted file mode 100644 index 9fd9e6343..000000000 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/IFlagModelElement.java +++ /dev/null @@ -1,16 +0,0 @@ -package gov.nist.secauto.metaschema.docsgen.explode; - -import gov.nist.secauto.metaschema.model.common.IFlagDefinition; -import gov.nist.secauto.metaschema.model.common.IFlagInstance; -import gov.nist.secauto.metaschema.model.common.metapath.item.IFlagNodeItem; - -public interface IFlagModelElement extends IModelElement { - @Override - IFlagNodeItem getNodeItem(); - - @Override - IFlagDefinition getDefinition(); - - @Override - IFlagInstance getInstance(); -} diff --git a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/package-info.java b/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/package-info.java deleted file mode 100644 index 2cb38a04e..000000000 --- a/metaschema-documentation-generator/src/main/java/gov/nist/secauto/metaschema/docsgen/explode/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ - -package gov.nist.secauto.metaschema.docsgen.explode; \ No newline at end of file diff --git a/metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/XmlOutlineDocumentationGeneratorTest.java b/metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/XmlOutlineDocumentationGeneratorTest.java similarity index 85% rename from metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/XmlOutlineDocumentationGeneratorTest.java rename to metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/XmlOutlineDocumentationGeneratorTest.java index f412f6b54..5b3474bd3 100644 --- a/metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/XmlOutlineDocumentationGeneratorTest.java +++ b/metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/XmlOutlineDocumentationGeneratorTest.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.docsgen; +package dev.metaschema.docsgen; -import gov.nist.secauto.metaschema.model.MetaschemaLoader; -import gov.nist.secauto.metaschema.model.common.IMetaschema; -import gov.nist.secauto.metaschema.model.common.MetaschemaException; +import dev.metaschema.model.MetaschemaLoader; +import dev.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.MetaschemaException; import org.apache.commons.io.output.TeeOutputStream; import org.junit.jupiter.api.Test; diff --git a/metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/XmlReferenceDocumentationGeneratorTest.java b/metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/XmlReferenceDocumentationGeneratorTest.java similarity index 85% rename from metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/XmlReferenceDocumentationGeneratorTest.java rename to metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/XmlReferenceDocumentationGeneratorTest.java index cf7df84db..a7069f714 100644 --- a/metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/XmlReferenceDocumentationGeneratorTest.java +++ b/metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/XmlReferenceDocumentationGeneratorTest.java @@ -1,10 +1,10 @@ -package gov.nist.secauto.metaschema.docsgen; +package dev.metaschema.docsgen; -import gov.nist.secauto.metaschema.model.MetaschemaLoader; -import gov.nist.secauto.metaschema.model.common.IMetaschema; -import gov.nist.secauto.metaschema.model.common.MetaschemaException; +import dev.metaschema.model.MetaschemaLoader; +import dev.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.MetaschemaException; import org.apache.commons.io.output.TeeOutputStream; import org.junit.jupiter.api.Test; diff --git a/metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/explode/ExplosionVisitorTest.java b/metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/explode/ExplosionVisitorTest.java similarity index 81% rename from metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/explode/ExplosionVisitorTest.java rename to metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/explode/ExplosionVisitorTest.java index 0d49365d1..65655d6fc 100644 --- a/metaschema-documentation-generator/src/test/java/gov/nist/secauto/metaschema/docsgen/explode/ExplosionVisitorTest.java +++ b/metaschema-documentation-generator/src/test/java/dev/metaschema/docsgen/explode/ExplosionVisitorTest.java @@ -1,19 +1,19 @@ -package gov.nist.secauto.metaschema.docsgen.explode; +package dev.metaschema.docsgen.explode; import static org.junit.jupiter.api.Assertions.fail; -import gov.nist.secauto.metaschema.model.MetaschemaLoader; -import gov.nist.secauto.metaschema.model.common.IMetaschema; -import gov.nist.secauto.metaschema.model.common.MetaschemaException; -import gov.nist.secauto.metaschema.model.common.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.model.common.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.model.common.metapath.DynamicContext; -import gov.nist.secauto.metaschema.model.common.metapath.StaticContext; -import gov.nist.secauto.metaschema.model.common.metapath.item.ICycledAssemblyNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.model.common.metapath.item.INodeItemFactory; -import gov.nist.secauto.metaschema.model.common.util.CustomCollectors; +import dev.metaschema.model.MetaschemaLoader; +import dev.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.MetaschemaException; +import dev.metaschema.model.common.constraint.IAllowedValue; +import dev.metaschema.model.common.constraint.IAllowedValuesConstraint; +import dev.metaschema.model.common.metapath.DynamicContext; +import dev.metaschema.model.common.metapath.StaticContext; +import dev.metaschema.model.common.metapath.item.ICycledAssemblyNodeItem; +import dev.metaschema.model.common.metapath.item.IDefinitionNodeItem; +import dev.metaschema.model.common.metapath.item.INodeItemFactory; +import dev.metaschema.model.common.util.CustomCollectors; import org.junit.jupiter.api.Test; diff --git a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/AbstractFreemarkerGenerator.java b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/AbstractFreemarkerGenerator.java similarity index 96% rename from metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/AbstractFreemarkerGenerator.java rename to metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/AbstractFreemarkerGenerator.java index a9c8c7153..0beb8f6a9 100644 --- a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/AbstractFreemarkerGenerator.java +++ b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/AbstractFreemarkerGenerator.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.freemarker.support; +package dev.metaschema.freemarker.support; -import gov.nist.secauto.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.IMetaschema; import java.io.IOException; import java.io.Writer; diff --git a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/IFreemarkerGenerator.java b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/IFreemarkerGenerator.java similarity index 82% rename from metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/IFreemarkerGenerator.java rename to metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/IFreemarkerGenerator.java index 1f54a816b..03f4f6518 100644 --- a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/IFreemarkerGenerator.java +++ b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/IFreemarkerGenerator.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.freemarker.support; +package dev.metaschema.freemarker.support; -import gov.nist.secauto.metaschema.model.common.IMetaschema; +import dev.metaschema.model.common.IMetaschema; import java.io.IOException; import java.io.Writer; diff --git a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/MarkupToHtmlMethod.java b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/MarkupToHtmlMethod.java similarity index 95% rename from metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/MarkupToHtmlMethod.java rename to metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/MarkupToHtmlMethod.java index 58e96f0ab..343f13351 100644 --- a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/MarkupToHtmlMethod.java +++ b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/MarkupToHtmlMethod.java @@ -1,11 +1,11 @@ -package gov.nist.secauto.metaschema.freemarker.support; +package dev.metaschema.freemarker.support; import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; -import gov.nist.secauto.metaschema.model.common.datatype.markup.IMarkupString; +import dev.metaschema.model.common.datatype.markup.IMarkupString; import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/MarkupToMarkdownMethod.java b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/MarkupToMarkdownMethod.java similarity index 88% rename from metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/MarkupToMarkdownMethod.java rename to metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/MarkupToMarkdownMethod.java index 85356e0bb..b8b48ba86 100644 --- a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/MarkupToMarkdownMethod.java +++ b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/MarkupToMarkdownMethod.java @@ -1,8 +1,8 @@ -package gov.nist.secauto.metaschema.freemarker.support; +package dev.metaschema.freemarker.support; -import gov.nist.secauto.metaschema.model.common.datatype.markup.IMarkupString; +import dev.metaschema.model.common.datatype.markup.IMarkupString; import java.util.List; diff --git a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/ToCamelCaseMethod.java b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/ToCamelCaseMethod.java similarity index 94% rename from metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/ToCamelCaseMethod.java rename to metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/ToCamelCaseMethod.java index b72d2b1fb..f277953f9 100644 --- a/metaschema-freemarker-support/src/main/java/gov/nist/secauto/metaschema/freemarker/support/ToCamelCaseMethod.java +++ b/metaschema-freemarker-support/src/main/java/dev/metaschema/freemarker/support/ToCamelCaseMethod.java @@ -1,6 +1,6 @@ -package gov.nist.secauto.metaschema.freemarker.support; +package dev.metaschema.freemarker.support; import java.util.List; import java.util.Locale; diff --git a/metaschema-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs b/metaschema-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs index 775dae91e..eb9e0b308 100644 --- a/metaschema-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs +++ b/metaschema-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false -org.eclipse.jdt.apt.reconcileEnabled=false +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/metaschema-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/metaschema-maven-plugin/.settings/org.eclipse.jdt.core.prefs index d5c6a182f..3d703be57 100644 --- a/metaschema-maven-plugin/.settings/org.eclipse.jdt.core.prefs +++ b/metaschema-maven-plugin/.settings/org.eclipse.jdt.core.prefs @@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false diff --git a/metaschema-maven-plugin/pom.xml b/metaschema-maven-plugin/pom.xml index e36845c7b..db6a511ca 100644 --- a/metaschema-maven-plugin/pom.xml +++ b/metaschema-maven-plugin/pom.xml @@ -118,7 +118,7 @@ both export overlapping packages) that prevent full JPMS compatibility. --> --add-reads - gov.nist.secauto.metaschema.maven.plugin=ALL-UNNAMED + dev.metaschema.maven.plugin=ALL-UNNAMED @@ -130,7 +130,7 @@ This mirrors the compiler configuration for JPMS compatibility. --> --add-reads - gov.nist.secauto.metaschema.maven.plugin=ALL-UNNAMED + dev.metaschema.maven.plugin=ALL-UNNAMED diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java similarity index 91% rename from metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java rename to metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java index d2170bc61..3eceafbc9 100644 --- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java @@ -3,42 +3,42 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.maven.plugin; - -import gov.nist.secauto.metaschema.core.model.IConstraintLoader; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.IModuleLoader; -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.constraint.ExternalConstraintsModulePostProcessor; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -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.JsonValidationFinding; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -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.PostProcessingModuleLoaderStrategy; -import gov.nist.secauto.metaschema.databind.SimpleModuleLoaderStrategy; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedClass; -import gov.nist.secauto.metaschema.databind.codegen.IGeneratedModuleClass; -import gov.nist.secauto.metaschema.databind.codegen.IModuleBindingGenerator; -import gov.nist.secauto.metaschema.databind.codegen.IProduction; -import gov.nist.secauto.metaschema.databind.codegen.JavaCompilerSupport; -import gov.nist.secauto.metaschema.databind.codegen.JavaGenerator; -import gov.nist.secauto.metaschema.databind.codegen.ModuleCompilerHelper; -import gov.nist.secauto.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; +package dev.metaschema.maven.plugin; + +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModuleLoader; +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.constraint.ExternalConstraintsModulePostProcessor; +import dev.metaschema.core.model.constraint.IConstraintSet; +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.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.PostProcessingModuleLoaderStrategy; +import dev.metaschema.databind.SimpleModuleLoaderStrategy; +import dev.metaschema.databind.codegen.IGeneratedClass; +import dev.metaschema.databind.codegen.IGeneratedModuleClass; +import dev.metaschema.databind.codegen.IModuleBindingGenerator; +import dev.metaschema.databind.codegen.IProduction; +import dev.metaschema.databind.codegen.JavaCompilerSupport; +import dev.metaschema.databind.codegen.JavaGenerator; +import dev.metaschema.databind.codegen.ModuleCompilerHelper; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.metaschema.BindingModuleLoader; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java similarity index 91% rename from metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java rename to metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java index 219351ac7..a3a3fbfbf 100644 --- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.maven.plugin; - -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.ISchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator; +package dev.metaschema.maven.plugin; + +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.ISchemaGenerator; +import dev.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java similarity index 88% rename from metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java rename to metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java index 6ff1d2e3c..3c0b75b17 100644 --- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.maven.plugin; +package dev.metaschema.maven.plugin; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.codegen.IProduction; -import gov.nist.secauto.metaschema.databind.codegen.JavaGenerator; -import gov.nist.secauto.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import gov.nist.secauto.metaschema.databind.io.BindingException; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.IProduction; +import dev.metaschema.databind.codegen.JavaGenerator; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.io.BindingException; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/package-info.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/package-info.java similarity index 60% rename from metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/package-info.java rename to metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/package-info.java index 17cf36c28..e2487999b 100644 --- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/package-info.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/package-info.java @@ -21,20 +21,20 @@ *

      * Key classes: *

        - *
      • {@link gov.nist.secauto.metaschema.maven.plugin.AbstractMetaschemaMojo} - - * Base class providing common functionality for module loading, constraint - * handling, and incremental build support
        • - *
      • {@link gov.nist.secauto.metaschema.maven.plugin.GenerateSourcesMojo} - - * Generates Java binding classes from Metaschema modules
        • - *
      • {@link gov.nist.secauto.metaschema.maven.plugin.GenerateSchemaMojo} - - * Generates schema files from Metaschema modules
        • + *
      • {@link dev.metaschema.maven.plugin.AbstractMetaschemaMojo} - Base class + * providing common functionality for module loading, constraint handling, and + * incremental build support
        • + *
      • {@link dev.metaschema.maven.plugin.GenerateSourcesMojo} - Generates Java + * binding classes from Metaschema modules
        • + *
      • {@link dev.metaschema.maven.plugin.GenerateSchemaMojo} - Generates schema + * files from Metaschema modules
        • *
      *

      * Example plugin configuration: * * 

      {@code
  * 
- *   gov.nist.secauto.metaschema
+ *   dev.metaschema
  *   metaschema-maven-plugin
  *   
  *     
@@ -46,8 +46,8 @@
  * 
  * }
      * - * @see gov.nist.secauto.metaschema.maven.plugin.GenerateSourcesMojo - * @see gov.nist.secauto.metaschema.maven.plugin.GenerateSchemaMojo + * @see dev.metaschema.maven.plugin.GenerateSourcesMojo + * @see dev.metaschema.maven.plugin.GenerateSchemaMojo */ -package gov.nist.secauto.metaschema.maven.plugin; +package dev.metaschema.maven.plugin; diff --git a/metaschema-maven-plugin/src/main/java/module-info.java b/metaschema-maven-plugin/src/main/java/module-info.java index 3a243fa3b..f35b15d3d 100644 --- a/metaschema-maven-plugin/src/main/java/module-info.java +++ b/metaschema-maven-plugin/src/main/java/module-info.java @@ -9,13 +9,13 @@ * This module uses the Maven API at runtime via the unnamed module, as Maven's * APIs have split package issues that prevent full JPMS compatibility. */ -module gov.nist.secauto.metaschema.maven.plugin { +module dev.metaschema.maven.plugin { // requirements requires java.base; - requires transitive gov.nist.secauto.metaschema.core; - requires transitive gov.nist.secauto.metaschema.databind; - requires transitive gov.nist.secauto.metaschema.schemagen; + requires transitive dev.metaschema.core; + requires transitive dev.metaschema.databind; + requires transitive dev.metaschema.schemagen; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; @@ -23,5 +23,5 @@ requires org.apache.logging.log4j; requires org.apache.logging.log4j.core; - exports gov.nist.secauto.metaschema.maven.plugin; + exports dev.metaschema.maven.plugin; } diff --git a/metaschema-testing/.settings/org.eclipse.jdt.apt.core.prefs b/metaschema-testing/.settings/org.eclipse.jdt.apt.core.prefs index 775dae91e..eb9e0b308 100644 --- a/metaschema-testing/.settings/org.eclipse.jdt.apt.core.prefs +++ b/metaschema-testing/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false -org.eclipse.jdt.apt.reconcileEnabled=false +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/metaschema-testing/.settings/org.eclipse.jdt.core.prefs b/metaschema-testing/.settings/org.eclipse.jdt.core.prefs index d5c6a182f..3d703be57 100644 --- a/metaschema-testing/.settings/org.eclipse.jdt.core.prefs +++ b/metaschema-testing/.settings/org.eclipse.jdt.core.prefs @@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false diff --git a/metaschema-testing/README.md b/metaschema-testing/README.md index 3ec9feeb7..b8ca0dc46 100644 --- a/metaschema-testing/README.md +++ b/metaschema-testing/README.md @@ -4,7 +4,7 @@ This module provides unit testing support used by other modules in this project. ## Bootstrap Binding Classes -The test suite binding classes in `gov.nist.secauto.metaschema.model.testing.testsuite` are pre-generated and checked into source control. This is necessary because: +The test suite binding classes in `dev.metaschema.model.testing.testsuite` are pre-generated and checked into source control. This is necessary because: 1. The `metaschema-maven-plugin` depends on `metaschema-schema-generator` 2. `metaschema-schema-generator` depends on `metaschema-testing` for test utilities @@ -19,8 +19,8 @@ When the test suite Metaschema module (`src/main/metaschema/unit-tests.yaml`) ch mvn -f metaschema-testing/pom-bootstrap.xml generate-sources # Copy generated classes to source -cp -r metaschema-testing/target/generated-sources/metaschema/gov/nist/secauto/metaschema/model/testing/testsuite/* \ - metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/ +cp -r metaschema-testing/target/generated-sources/metaschema/dev/metaschema/model/testing/testsuite/* \ + metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ ``` -The binding configuration (`src/main/metaschema-bindings/test-suite-bindings.xml`) maps the namespace to the `gov.nist.secauto.metaschema.model.testing.testsuite` package. +The binding configuration (`src/main/metaschema-bindings/test-suite-bindings.xml`) maps the namespace to the `dev.metaschema.model.testing.testsuite` package. diff --git a/metaschema-testing/pom-bootstrap.xml b/metaschema-testing/pom-bootstrap.xml index b7b53c08f..b7a81a02d 100644 --- a/metaschema-testing/pom-bootstrap.xml +++ b/metaschema-testing/pom-bootstrap.xml @@ -22,7 +22,7 @@ Standalone POM for regenerating test suite binding classes. - ${project.basedir}/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite + ${project.basedir}/src/main/java/dev/metaschema/model/testing/testsuite ${project.build.directory}/metaschema @@ -100,7 +100,7 @@
      cc0-dedication.txt
      - src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/**/*.java + src/main/java/dev/metaschema/model/testing/testsuite/**/*.java       @@ -120,7 +120,7 @@ - src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/**/*.java + src/main/java/dev/metaschema/model/testing/testsuite/**/*.java diff --git a/metaschema-testing/pom.xml b/metaschema-testing/pom.xml index 21fe5a011..79468554e 100644 --- a/metaschema-testing/pom.xml +++ b/metaschema-testing/pom.xml @@ -55,7 +55,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - **/gov/nist/secauto/metaschema/model/testing/testsuite/**/* + **/dev/metaschema/model/testing/testsuite/**/* diff --git a/metaschema-testing/src/main/config/pmd/field-naming-ruleset.xml b/metaschema-testing/src/main/config/pmd/field-naming-ruleset.xml index 8939a8df1..d7df27290 100644 --- a/metaschema-testing/src/main/config/pmd/field-naming-ruleset.xml +++ b/metaschema-testing/src/main/config/pmd/field-naming-ruleset.xml @@ -10,7 +10,7 @@ - .*/gov/nist/secauto/metaschema/model/testing/testsuite/.*\.java + .*/dev/metaschema/model/testing/testsuite/.*\.java diff --git a/metaschema-testing/src/main/config/spotbugs/exclude.xml b/metaschema-testing/src/main/config/spotbugs/exclude.xml index 81b0a3535..97cf7c942 100644 --- a/metaschema-testing/src/main/config/spotbugs/exclude.xml +++ b/metaschema-testing/src/main/config/spotbugs/exclude.xml @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java similarity index 94% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java index 0d2a59679..1121bb6bd 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java @@ -3,27 +3,27 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.model.testing; +package dev.metaschema.model.testing; import static org.junit.jupiter.api.Assertions.assertEquals; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.validation.IContentValidator; -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.JsonValidationFinding; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.ISerializer; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.model.testing.testsuite.GenerateSchema; -import gov.nist.secauto.metaschema.model.testing.testsuite.Metaschema; -import gov.nist.secauto.metaschema.model.testing.testsuite.TestCollection; -import gov.nist.secauto.metaschema.model.testing.testsuite.TestScenario; -import gov.nist.secauto.metaschema.model.testing.testsuite.TestSuite; -import gov.nist.secauto.metaschema.model.testing.testsuite.ValidationCase; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.validation.IContentValidator; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.model.testing.testsuite.GenerateSchema; +import dev.metaschema.model.testing.testsuite.Metaschema; +import dev.metaschema.model.testing.testsuite.TestCollection; +import dev.metaschema.model.testing.testsuite.TestScenario; +import dev.metaschema.model.testing.testsuite.TestSuite; +import dev.metaschema.model.testing.testsuite.ValidationCase; import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/DeadlockDetectionExtension.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/DeadlockDetectionExtension.java similarity index 98% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/DeadlockDetectionExtension.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/DeadlockDetectionExtension.java index d6bcc49bb..8269de066 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/DeadlockDetectionExtension.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/DeadlockDetectionExtension.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.model.testing; +package dev.metaschema.model.testing; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/package-info.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/package-info.java similarity index 75% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/package-info.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/package-info.java index 33d48b3e4..f3d87663e 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/package-info.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/package-info.java @@ -7,4 +7,4 @@ * Provides testing utilities for Metaschema modules and constraints. */ -package gov.nist.secauto.metaschema.model.testing; +package dev.metaschema.model.testing; diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/GenerateSchema.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java similarity index 83% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/GenerateSchema.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java index b4e7a10c7..0fe2f4e97 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/GenerateSchema.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java @@ -2,26 +2,26 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; +package dev.metaschema.model.testing.testsuite; +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -90,8 +90,8 @@ public class GenerateSchema implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.GenerateSchema} - * instance with no metadata. + * {@code dev.metaschema.model.testing.testsuite.GenerateSchema} instance with + * no metadata. */ public GenerateSchema() { this(null); @@ -99,8 +99,8 @@ public GenerateSchema() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.GenerateSchema} - * instance with the specified metadata. + * {@code dev.metaschema.model.testing.testsuite.GenerateSchema} instance with + * the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/GenerationCase.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java similarity index 79% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/GenerationCase.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java index 6b2487192..ce1827058 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/GenerationCase.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java @@ -2,24 +2,24 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; - +package dev.metaschema.model.testing.testsuite; + +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.net.URI; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -76,8 +76,8 @@ public class GenerationCase implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.GenerationCase} - * instance with no metadata. + * {@code dev.metaschema.model.testing.testsuite.GenerationCase} instance with + * no metadata. */ public GenerationCase() { this(null); @@ -85,8 +85,8 @@ public GenerationCase() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.GenerationCase} - * instance with the specified metadata. + * {@code dev.metaschema.model.testing.testsuite.GenerationCase} instance with + * the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/Metaschema.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java similarity index 72% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/Metaschema.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java index 5fb2dcfab..7869e5fd0 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/Metaschema.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java @@ -2,18 +2,18 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; +package dev.metaschema.model.testing.testsuite; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.net.URI; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -41,8 +41,7 @@ public class Metaschema implements IBoundObject { private URI _location; /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.Metaschema} + * Constructs a new {@code dev.metaschema.model.testing.testsuite.Metaschema} * instance with no metadata. */ public Metaschema() { @@ -50,8 +49,7 @@ public Metaschema() { } /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.Metaschema} + * Constructs a new {@code dev.metaschema.model.testing.testsuite.Metaschema} * instance with the specified metadata. * * @param data diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java similarity index 76% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java index 3be9be73d..d7547d349 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java @@ -2,17 +2,17 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; +package dev.metaschema.model.testing.testsuite; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.AbstractBoundModule; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.annotations.MetaschemaModule; import java.net.URI; import java.util.List; diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestCollection.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java similarity index 81% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestCollection.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java index 6a879ed7e..1439ece5c 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestCollection.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java @@ -2,22 +2,22 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; - +package dev.metaschema.model.testing.testsuite; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.net.URI; import java.util.LinkedList; import java.util.List; @@ -71,8 +71,8 @@ public class TestCollection implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.TestCollection} - * instance with no metadata. + * {@code dev.metaschema.model.testing.testsuite.TestCollection} instance with + * no metadata. */ public TestCollection() { this(null); @@ -80,8 +80,8 @@ public TestCollection() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.TestCollection} - * instance with the specified metadata. + * {@code dev.metaschema.model.testing.testsuite.TestCollection} instance with + * the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestScenario.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java similarity index 83% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestScenario.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java index f619d0727..3fead89a5 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestScenario.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java @@ -2,22 +2,22 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; - +package dev.metaschema.model.testing.testsuite; + +import dev.metaschema.core.datatype.adapter.StringAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -66,8 +66,7 @@ public class TestScenario implements IBoundObject { private List _validationCases; /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.TestScenario} + * Constructs a new {@code dev.metaschema.model.testing.testsuite.TestScenario} * instance with no metadata. */ public TestScenario() { @@ -75,8 +74,7 @@ public TestScenario() { } /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.TestScenario} + * Constructs a new {@code dev.metaschema.model.testing.testsuite.TestScenario} * instance with the specified metadata. * * @param data diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestSuite.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java similarity index 80% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestSuite.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java index 798d9f48e..ac3ff450a 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/TestSuite.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java @@ -2,19 +2,19 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; +package dev.metaschema.model.testing.testsuite; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundAssembly; +import dev.metaschema.databind.model.annotations.GroupAs; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -45,8 +45,7 @@ public class TestSuite implements IBoundObject { private List _testCollections; /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.TestSuite} + * Constructs a new {@code dev.metaschema.model.testing.testsuite.TestSuite} * instance with no metadata. */ public TestSuite() { @@ -54,8 +53,7 @@ public TestSuite() { } /** - * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.TestSuite} + * Constructs a new {@code dev.metaschema.model.testing.testsuite.TestSuite} * instance with the specified metadata. * * @param data diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/ValidationCase.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java similarity index 79% rename from metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/ValidationCase.java rename to metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java index f4db8a0b9..0c63c5ab0 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/ValidationCase.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java @@ -2,24 +2,24 @@ * SPDX-FileCopyrightText: none * SPDX-License-Identifier: CC0-1.0 */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml +// Generated from: ../../../../../../metaschema/unit-tests.yaml // Do not edit - changes will be lost when regenerated. -package gov.nist.secauto.metaschema.model.testing.testsuite; - +package dev.metaschema.model.testing.testsuite; + +import dev.metaschema.core.datatype.adapter.TokenAdapter; +import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IMetaschemaData; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.AllowedValue; +import dev.metaschema.databind.model.annotations.AllowedValues; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.MetaschemaAssembly; +import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.core.model.IMetaschemaData; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraint; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue; -import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues; -import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag; -import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly; -import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints; import java.net.URI; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -77,8 +77,8 @@ public class ValidationCase implements IBoundObject { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.ValidationCase} - * instance with no metadata. + * {@code dev.metaschema.model.testing.testsuite.ValidationCase} instance with + * no metadata. */ public ValidationCase() { this(null); @@ -86,8 +86,8 @@ public ValidationCase() { /** * Constructs a new - * {@code gov.nist.secauto.metaschema.model.testing.testsuite.ValidationCase} - * instance with the specified metadata. + * {@code dev.metaschema.model.testing.testsuite.ValidationCase} instance with + * the specified metadata. * * @param data * the metaschema data, or {@code null} if none diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/package-info.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/package-info.java new file mode 100644 index 000000000..94800e1ae --- /dev/null +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/package-info.java @@ -0,0 +1,20 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ +// Generated from: ../../../../../../metaschema/unit-tests.yaml +// Do not edit - changes will be lost when regenerated. +/** + * Provides generated Metaschema binding classes for module(s): Metaschema Test + * Suite. + *

      + * version 1.0.0 + */ + +@dev.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { + dev.metaschema.model.testing.testsuite.MetaschemaTestSuiteModule.class }) +@dev.metaschema.databind.model.annotations.XmlSchema(namespace = "http://csrc.nist.gov/ns/metaschema/test-suite/1.0", + xmlns = { @dev.metaschema.databind.model.annotations.XmlNs(prefix = "", + namespace = "http://csrc.nist.gov/ns/metaschema/test-suite/1.0") }, + xmlElementFormDefault = dev.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED) +package dev.metaschema.model.testing.testsuite; diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/package-info.java b/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/package-info.java deleted file mode 100644 index 0570da4c1..000000000 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/testsuite/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ -// Generated from: ../../../../../../../../metaschema/unit-tests.yaml -// Do not edit - changes will be lost when regenerated. -/** - * Provides generated Metaschema binding classes for module(s): Metaschema Test - * Suite. - *

      - * version 1.0.0 - */ - -@gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { - gov.nist.secauto.metaschema.model.testing.testsuite.MetaschemaTestSuiteModule.class }) -@gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema( - namespace = "http://csrc.nist.gov/ns/metaschema/test-suite/1.0", - xmlns = { @gov.nist.secauto.metaschema.databind.model.annotations.XmlNs(prefix = "", - namespace = "http://csrc.nist.gov/ns/metaschema/test-suite/1.0") }, - xmlElementFormDefault = gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED) -package gov.nist.secauto.metaschema.model.testing.testsuite; diff --git a/metaschema-testing/src/main/java/module-info.java b/metaschema-testing/src/main/java/module-info.java index 617994781..559298b8f 100644 --- a/metaschema-testing/src/main/java/module-info.java +++ b/metaschema-testing/src/main/java/module-info.java @@ -6,13 +6,13 @@ /** * Provides unit testing support for Metaschema modules and constraints. */ -module gov.nist.secauto.metaschema.testing { +module dev.metaschema.testing { // requirements requires java.base; requires java.management; - requires transitive gov.nist.secauto.metaschema.core; - requires transitive gov.nist.secauto.metaschema.databind; + requires transitive dev.metaschema.core; + requires transitive dev.metaschema.databind; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; @@ -22,9 +22,9 @@ requires org.apache.logging.log4j; requires transitive org.junit.jupiter.api; - exports gov.nist.secauto.metaschema.model.testing; - exports gov.nist.secauto.metaschema.model.testing.testsuite; + exports dev.metaschema.model.testing; + exports dev.metaschema.model.testing.testsuite; // open binding classes for reflection - opens gov.nist.secauto.metaschema.model.testing.testsuite; + opens dev.metaschema.model.testing.testsuite; } diff --git a/metaschema-testing/src/main/metaschema-bindings/test-suite-bindings.xml b/metaschema-testing/src/main/metaschema-bindings/test-suite-bindings.xml index e0cb9668e..18753124a 100644 --- a/metaschema-testing/src/main/metaschema-bindings/test-suite-bindings.xml +++ b/metaschema-testing/src/main/metaschema-bindings/test-suite-bindings.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="https://csrc.nist.gov/ns/metaschema-binding/1.0 ../../xsd/metaschema-binding.xsd"> - gov.nist.secauto.metaschema.model.testing.testsuite + dev.metaschema.model.testing.testsuite diff --git a/metaschema-testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/metaschema-testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension index 49019aa70..5822f03cc 100644 --- a/metaschema-testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ b/metaschema-testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -1 +1 @@ -gov.nist.secauto.metaschema.model.testing.DeadlockDetectionExtension +dev.metaschema.model.testing.DeadlockDetectionExtension diff --git a/metaschema-testing/src/test/resources/log4j2-test.xml b/metaschema-testing/src/test/resources/log4j2-test.xml index 2999d73e4..8e1c99c72 100644 --- a/metaschema-testing/src/test/resources/log4j2-test.xml +++ b/metaschema-testing/src/test/resources/log4j2-test.xml @@ -10,7 +10,7 @@ - + diff --git a/schemagen/.settings/org.eclipse.jdt.apt.core.prefs b/schemagen/.settings/org.eclipse.jdt.apt.core.prefs index 775dae91e..eb9e0b308 100644 --- a/schemagen/.settings/org.eclipse.jdt.apt.core.prefs +++ b/schemagen/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false -org.eclipse.jdt.apt.reconcileEnabled=false +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/schemagen/.settings/org.eclipse.jdt.core.prefs b/schemagen/.settings/org.eclipse.jdt.core.prefs index d5c6a182f..3d703be57 100644 --- a/schemagen/.settings/org.eclipse.jdt.core.prefs +++ b/schemagen/.settings/org.eclipse.jdt.core.prefs @@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java rename to schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java index 97427a568..1c7a315d0 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -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.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeManager; +package dev.metaschema.schemagen; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.datatype.IDatatypeManager; import org.eclipse.jdt.annotation.NotOwning; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java rename to schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java index 33929117e..d2b4d8f20 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeManager; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.datatype.IDatatypeManager; import org.eclipse.jdt.annotation.Owning; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ChoiceNotInlineStrategy.java b/schemagen/src/main/java/dev/metaschema/schemagen/ChoiceNotInlineStrategy.java similarity index 81% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ChoiceNotInlineStrategy.java rename to schemagen/src/main/java/dev/metaschema/schemagen/ChoiceNotInlineStrategy.java index b5c176492..e0e17aa73 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ChoiceNotInlineStrategy.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/ChoiceNotInlineStrategy.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IDefinition; /** * An inline strategy that inlines definitions unless they are contained within diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/FlagInstanceFilter.java b/schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java similarity index 95% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/FlagInstanceFilter.java rename to schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java index a2a9aeca9..d569a2700 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/FlagInstanceFilter.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.function.Predicate; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/IGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/IGenerationState.java rename to schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java index 653d3ead7..1580de92a 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/IGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModule; import java.io.IOException; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/IInlineStrategy.java b/schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java similarity index 93% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/IInlineStrategy.java rename to schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java index f105c7415..c19ba078b 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/IInlineStrategy.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.model.IDefinition; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IDefinition; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ISchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ISchemaGenerator.java rename to schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java index a82c398cb..7be1decda 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ISchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import java.io.IOException; import java.io.Writer; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java b/schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java rename to schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java index 66fcb18cb..57d8a47ef 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; - -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstance; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.ModelWalker; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +package dev.metaschema.schemagen; + +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.model.INamedModelInstance; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.ModelWalker; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; import java.util.HashSet; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/SchemaGenerationException.java b/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationException.java similarity index 97% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/SchemaGenerationException.java rename to schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationException.java index 03a0982f2..424054f43 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/SchemaGenerationException.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/SchemaGenerationFeature.java b/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/SchemaGenerationFeature.java rename to schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java index 315dbe14b..650e4606d 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/SchemaGenerationFeature.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -import gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature; +import dev.metaschema.core.configuration.AbstractConfigurationFeature; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java similarity index 96% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java rename to schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java index 9e8949ec0..8d3de88c9 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.datatype; +package dev.metaschema.schemagen.datatype; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; import java.util.Collections; import java.util.HashSet; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java similarity index 86% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeManager.java rename to schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java index 7bf69987c..a9c1fc37a 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.datatype; +package dev.metaschema.schemagen.datatype; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; import java.util.Set; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/package-info.java similarity index 73% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/package-info.java rename to schemagen/src/main/java/dev/metaschema/schemagen/datatype/package-info.java index 24e990db3..48d7e7208 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/package-info.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/package-info.java @@ -10,7 +10,7 @@ * datatypes during schema generation, including mapping Metaschema types to * their corresponding schema representations. * - * @see gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeManager + * @see dev.metaschema.schemagen.datatype.IDatatypeManager */ -package gov.nist.secauto.metaschema.schemagen.datatype; +package dev.metaschema.schemagen.datatype; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/JsonSchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java similarity index 77% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/JsonSchemaGenerator.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java index 0a283ecdc..91a4015ac 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/JsonSchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json; +package dev.metaschema.schemagen.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; @@ -11,16 +11,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.AbstractSchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.metaschema.schemagen.json.impl.IJsonSchema; -import gov.nist.secauto.metaschema.schemagen.json.impl.JsonDatatypeManager; -import gov.nist.secauto.metaschema.schemagen.json.impl.JsonGenerationState; -import gov.nist.secauto.metaschema.schemagen.json.impl.JsonSchemaModule; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.AbstractSchemaGenerator; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.schemagen.json.impl.IJsonSchema; +import dev.metaschema.schemagen.json.impl.JsonDatatypeManager; +import dev.metaschema.schemagen.json.impl.JsonGenerationState; +import dev.metaschema.schemagen.json.impl.JsonSchemaModule; import java.io.IOException; import java.io.Writer; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java index ad1520ea0..0192211a6 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java index 7a0be6f86..e3ec0ba8c 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java index 6d137e8e2..78dfd7288 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Set; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java similarity index 94% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java index 77f2675fa..43d32065f 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java index 22fb1b2b9..f40bf06fd 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Set; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java index 85bbe8429..ba45b9fce 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IInstance; +import dev.metaschema.core.model.IInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java similarity index 85% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java index 9b25b5892..657d81595 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java similarity index 84% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java index acd25a3f9..29571b299 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java similarity index 82% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java index 876e348cc..96a6c4fe0 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java similarity index 87% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java index 5c16eeb0c..0a94c04d7 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/DataTypeJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/DataTypeJsonSchema.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java index 3753c4654..4f80c3a11 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/DataTypeJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.util.ObjectUtils; import java.util.Set; import java.util.stream.Stream; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java similarity index 88% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java index 59d5c7779..2ce30ba35 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.adapter.DecimalAdapter; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -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.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.AbstractGenerationState.AllowedValueCollection; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.AbstractGenerationState.AllowedValueCollection; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ICardinalityBehavior.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ICardinalityBehavior.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java index e55aa665c..1b7da2307 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ICardinalityBehavior.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IModelInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java similarity index 80% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java index 78dcbc779..b7d0209e6 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.IDataTypeAdapter; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonGenerationState.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java index 3d09d7532..a06a7142e 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.schemagen.IGenerationState; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.schemagen.IGenerationState; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchema.java similarity index 96% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchema.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchema.java index 6d72b7143..be2928776 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchema.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinable.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinable.java similarity index 98% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinable.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinable.java index 1f748fbf7..1fb8865d4 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinable.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinable.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java index 3d4645152..e613b6a71 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IDefinition; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java similarity index 81% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java index 7a1a31367..967ecac85 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceInstance; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java similarity index 87% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java index f333911a8..9556ad7a1 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldDefinition; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java similarity index 86% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java index 8647a5a0f..34bf50d13 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaProperty.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaProperty.java similarity index 95% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaProperty.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaProperty.java index c9133b753..9e988f3a0 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaProperty.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaProperty.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java similarity index 80% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java index f1716e937..982264722 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java similarity index 80% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java index 0620616a3..cfa939693 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.INamedModelInstanceGrouped; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyNamed.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyNamed.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyNamed.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyNamed.java index 3ea1393d3..262cf4830 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/IJsonSchemaPropertyNamed.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyNamed.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonDatatypeManager.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java index dc7296eac..c9bc7c1a4 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.MetaschemaModelConstants; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.datatype.AbstractDatatypeManager; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.datatype.AbstractDatatypeManager; import java.io.IOException; import java.io.InputStream; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java similarity index 88% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonGenerationState.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java index 6368d2d22..cf2156191 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java @@ -3,35 +3,35 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.AbstractGenerationState; -import gov.nist.secauto.metaschema.schemagen.IGenerationState; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.AbstractGenerationState; +import dev.metaschema.schemagen.IGenerationState; +import dev.metaschema.schemagen.SchemaGenerationFeature; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java index f993c4996..011e41fb0 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java index 7be76426a..b02723799 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.qname.IEnhancedQName; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java index ddd69b08e..da51e07ce 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.util.ObjectUtils; import java.util.Set; import java.util.stream.Stream; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaHelper.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java similarity index 94% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaHelper.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java index 8f4161ac7..47479fe06 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaHelper.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -17,20 +17,20 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElement; -import gov.nist.secauto.metaschema.core.model.INamedModelElement; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.core.model.IValuedInstance; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IContainerModelAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.INamedModelElement; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.model.IValuedInstance; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaModule.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java similarity index 93% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaModule.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java index 1c709cb3b..078824578 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaModule.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; import java.util.List; import java.util.Set; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java similarity index 85% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java index eba6f7ad3..7e924587e 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstance; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.model.IAssemblyInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import java.util.Set; import java.util.stream.Stream; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java index ad30996c5..04c476ec4 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.Set; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java similarity index 87% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java index b825c47f7..067abd167 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFieldInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.CollectionUtil; import java.util.Set; import java.util.stream.Stream; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java similarity index 94% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java index 565e364d5..563a0a012 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IFlagInstance; import java.util.Set; import java.util.stream.Stream; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java index 69e17c596..1f861e506 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; import java.util.ArrayList; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java similarity index 88% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java index f79b910d9..966914adb 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/package-info.java similarity index 85% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/package-info.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/impl/package-info.java index 144c6be04..4a954c82f 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/package-info.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/package-info.java @@ -11,4 +11,4 @@ * JSON Schema documents. */ -package gov.nist.secauto.metaschema.schemagen.json.impl; +package dev.metaschema.schemagen.json.impl; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/package-info.java similarity index 73% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/package-info.java rename to schemagen/src/main/java/dev/metaschema/schemagen/json/package-info.java index 65a00790c..ebfcd5651 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/package-info.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/package-info.java @@ -10,7 +10,7 @@ * transforms Metaschema module definitions into JSON Schema documents * conforming to the JSON Schema specification. * - * @see gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator + * @see dev.metaschema.schemagen.json.JsonSchemaGenerator */ -package gov.nist.secauto.metaschema.schemagen.json; +package dev.metaschema.schemagen.json; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/package-info.java new file mode 100644 index 000000000..035f8eead --- /dev/null +++ b/schemagen/src/main/java/dev/metaschema/schemagen/package-info.java @@ -0,0 +1,27 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +/** + * Provides schema generation capabilities for Metaschema modules. + *

      + * This package contains the core API and implementations for generating XML + * Schema (XSD) and JSON Schema from Metaschema module definitions. The main + * entry point is {@link dev.metaschema.schemagen.ISchemaGenerator}, which + * provides methods to generate schemas in different formats. + *

      + * Key classes: + *

        + *
      • {@link dev.metaschema.schemagen.ISchemaGenerator} - Main interface for + * schema generation
        • + *
      • {@link dev.metaschema.schemagen.IGenerationState} - Manages state during + * schema generation
        • + *
      • {@link dev.metaschema.schemagen.IInlineStrategy} - Controls definition + * inlining behavior
        • + *
      • {@link dev.metaschema.schemagen.ModuleIndex} - Indexes definitions across + * modules
        • + *
      + */ + +package dev.metaschema.schemagen; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java index 2a5eb1616..0889aaa38 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml; // NOPMD +package dev.metaschema.schemagen.xml; // NOPMD import com.ctc.wstx.stax.WstxOutputFactory; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.AbstractSchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IndentingXMLStreamWriter2; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlDatatypeManager; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlType; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.AbstractSchemaGenerator; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.schemagen.xml.impl.IndentingXMLStreamWriter2; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; +import dev.metaschema.schemagen.xml.impl.XmlGenerationState; +import dev.metaschema.schemagen.xml.impl.schematype.IXmlType; import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java index 47fdd7080..bfb41b5e3 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import java.util.ArrayList; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java similarity index 98% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java index c98dff718..e0d4fadb6 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamWriter2; import org.eclipse.jdt.annotation.Owning; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java similarity index 88% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java index aa3ed2993..61e4e110f 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.eclipse.jdt.annotation.Owning; import org.w3c.dom.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java index 2d7ff9691..a7d90b873 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DocumentationGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DocumentationGenerator.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java index 5cf414480..edc123957 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DocumentationGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElement; -import gov.nist.secauto.metaschema.core.model.INamedInstance; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; +package dev.metaschema.schemagen.xml.impl; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.schemagen.SchemaGenerationException; import java.util.ArrayList; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContent.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java similarity index 98% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContent.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java index fb96b547c..6094aeb52 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContent.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IDatatypeContent.java similarity index 93% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IDatatypeContent.java index f75ab7096..52bd7410a 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IDatatypeContent.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IDatatypeProvider.java similarity index 96% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IDatatypeProvider.java index e99cd2192..c0d2cc5af 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IXmlGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IXmlGenerationState.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java index df931c880..6098d9333 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IXmlGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; - -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElement; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.schemagen.ModuleIndex; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlSimpleType; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlType; +package dev.metaschema.schemagen.xml.impl; + +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.schemagen.ModuleIndex; +import dev.metaschema.schemagen.xml.impl.schematype.IXmlSimpleType; +import dev.metaschema.schemagen.xml.impl.schematype.IXmlType; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java similarity index 99% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java index dd7eb1c36..b9f7d7333 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import java.util.ArrayDeque; import java.util.Deque; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter2.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter2.java similarity index 99% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter2.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter2.java index 1c83bdf15..ed773682a 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter2.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriter2.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamLocation2; import org.codehaus.stax2.XMLStreamReader2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java index 3a90c4f92..b2f345d96 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.eclipse.jdt.annotation.Owning; import org.w3c.dom.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java similarity index 93% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlDatatypeManager.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java index 0c84dfb67..8e11d9d64 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.datatype.AbstractDatatypeManager; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.datatype.AbstractDatatypeManager; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java similarity index 88% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java index a1c209b59..ccc426383 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java @@ -3,31 +3,31 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; - -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagDefinition; -import gov.nist.secauto.metaschema.core.model.IModelElement; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.util.AutoCloser; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.AbstractGenerationState; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlComplexType; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlSimpleType; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlType; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlComplexTypeAssemblyDefinition; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlComplexTypeFieldDefinition; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeReference; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeRestriction; -import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeUnion; +package dev.metaschema.schemagen.xml.impl; + +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.IModelElement; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.AbstractGenerationState; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.schemagen.xml.impl.schematype.IXmlComplexType; +import dev.metaschema.schemagen.xml.impl.schematype.IXmlSimpleType; +import dev.metaschema.schemagen.xml.impl.schematype.IXmlType; +import dev.metaschema.schemagen.xml.impl.schematype.XmlComplexTypeAssemblyDefinition; +import dev.metaschema.schemagen.xml.impl.schematype.XmlComplexTypeFieldDefinition; +import dev.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeReference; +import dev.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeRestriction; +import dev.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeUnion; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java index 0c8ca2861..8ad26e876 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; public class XmlMarkupLineDatatypeProvider extends AbstractXmlMarkupDatatypeProvider { diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java index 4502d36fa..0486b62e0 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; public class XmlMarkupMultilineDatatypeProvider extends AbstractXmlMarkupDatatypeProvider { diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java similarity index 84% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java index fe1e5b685..34a1855b9 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import org.eclipse.jdt.annotation.Owning; import org.w3c.dom.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java similarity index 96% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java index ba42ce457..6224657f9 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoader.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoader.java similarity index 99% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoader.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoader.java index 4d9002441..9b5c18e8c 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoader.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/package-info.java similarity index 85% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/package-info.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/package-info.java index 8cd12e4d3..d2a5d24e8 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/package-info.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/package-info.java @@ -11,4 +11,4 @@ * generation utilities. */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java similarity index 87% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java index e47ee7add..a0f60167a 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; - -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelDefinition; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.xml.impl.DocumentationGenerator; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlDatatypeManager; +package dev.metaschema.schemagen.xml.impl.schematype; + +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.DocumentationGenerator; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java similarity index 84% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java index b70895c02..e3519c3db 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import javax.xml.namespace.QName; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java index 2d6464c75..72c6c89b9 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; import javax.xml.namespace.QName; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java similarity index 78% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java index cc653fe3c..7d4156971 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; -import gov.nist.secauto.metaschema.core.model.IDefinition; -import gov.nist.secauto.metaschema.schemagen.ModuleIndex.DefinitionEntry; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.schemagen.ModuleIndex.DefinitionEntry; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java similarity index 79% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java index 112ff855d..d51f647ae 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlType.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java index e663aac34..f6f668d96 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import javax.xml.XMLConstants; import javax.xml.namespace.QName; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java similarity index 90% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java index b737540e1..a11d13c07 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; -import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; -import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance; -import gov.nist.secauto.metaschema.core.model.IChoiceInstance; -import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute; -import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped; -import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior; -import gov.nist.secauto.metaschema.core.qname.IEnhancedQName; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.xml.impl.DocumentationGenerator; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlDatatypeManager; +package dev.metaschema.schemagen.xml.impl.schematype; + +import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IChoiceInstance; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.model.XmlGroupAsBehavior; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.DocumentationGenerator; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import java.util.Collection; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java similarity index 84% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java index 1c0332605..ec3e7419e 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.core.model.IFieldDefinition; -import gov.nist.secauto.metaschema.core.model.IFlagInstance; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlDatatypeManager; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java index 386162218..75edab9ad 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; -import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import javax.xml.namespace.QName; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java similarity index 87% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java index bd984823c..2e236cb27 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; - -import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.AbstractGenerationState.AllowedValueCollection; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlDatatypeManager; +package dev.metaschema.schemagen.xml.impl.schematype; + +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.AbstractGenerationState.AllowedValueCollection; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java similarity index 86% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java index 0cb8fdcd5..7a0c795f6 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; - -import gov.nist.secauto.metaschema.core.model.IValuedDefinition; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; -import gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlDatatypeManager; +package dev.metaschema.schemagen.xml.impl.schematype; + +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import java.util.LinkedList; import java.util.List; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/package-info.java similarity index 63% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/package-info.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/package-info.java index 74cf8d868..9185a1fcc 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/package-info.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/package-info.java @@ -10,8 +10,8 @@ * including both simple types (for scalar values) and complex types (for * structured content like assemblies and fields with flags). * - * @see gov.nist.secauto.metaschema.schemagen.xml.impl.IXmlGenerationState - * @see gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlType + * @see dev.metaschema.schemagen.xml.impl.IXmlGenerationState + * @see dev.metaschema.schemagen.xml.impl.schematype.IXmlType */ -package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; +package dev.metaschema.schemagen.xml.impl.schematype; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/package-info.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/package-info.java similarity index 72% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/package-info.java rename to schemagen/src/main/java/dev/metaschema/schemagen/xml/package-info.java index 86905b823..cd4374d1b 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/package-info.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/package-info.java @@ -9,7 +9,7 @@ * This package contains the XML Schema generator implementation that transforms * Metaschema module definitions into W3C XML Schema Definition (XSD) documents. * - * @see gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator + * @see dev.metaschema.schemagen.xml.XmlSchemaGenerator */ -package gov.nist.secauto.metaschema.schemagen.xml; +package dev.metaschema.schemagen.xml; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/package-info.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/package-info.java deleted file mode 100644 index 34793535d..000000000 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Provides schema generation capabilities for Metaschema modules. - *

      - * This package contains the core API and implementations for generating XML - * Schema (XSD) and JSON Schema from Metaschema module definitions. The main - * entry point is - * {@link gov.nist.secauto.metaschema.schemagen.ISchemaGenerator}, which - * provides methods to generate schemas in different formats. - *

      - * Key classes: - *

        - *
      • {@link gov.nist.secauto.metaschema.schemagen.ISchemaGenerator} - Main - * interface for schema generation
        • - *
      • {@link gov.nist.secauto.metaschema.schemagen.IGenerationState} - Manages - * state during schema generation
        • - *
      • {@link gov.nist.secauto.metaschema.schemagen.IInlineStrategy} - Controls - * definition inlining behavior
        • - *
      • {@link gov.nist.secauto.metaschema.schemagen.ModuleIndex} - Indexes - * definitions across modules
        • - *
      - */ - -package gov.nist.secauto.metaschema.schemagen; diff --git a/schemagen/src/main/java/module-info.java b/schemagen/src/main/java/module-info.java index 8d9abe023..afe89ced1 100644 --- a/schemagen/src/main/java/module-info.java +++ b/schemagen/src/main/java/module-info.java @@ -6,13 +6,13 @@ /** * Modules used by the Metaschema schema generator. */ -module gov.nist.secauto.metaschema.schemagen { +module dev.metaschema.schemagen { // requirements requires java.base; requires java.xml; - requires transitive gov.nist.secauto.metaschema.core; - requires transitive gov.nist.secauto.metaschema.databind; + requires transitive dev.metaschema.core; + requires transitive dev.metaschema.databind; requires com.ctc.wstx; requires com.github.spotbugs.annotations; @@ -22,7 +22,7 @@ requires org.codehaus.stax2; requires org.eclipse.jdt.annotation; - exports gov.nist.secauto.metaschema.schemagen; - exports gov.nist.secauto.metaschema.schemagen.json; - exports gov.nist.secauto.metaschema.schemagen.xml; + exports dev.metaschema.schemagen; + exports dev.metaschema.schemagen.json; + exports dev.metaschema.schemagen.xml; } diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java b/schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java similarity index 89% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java rename to schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java index 03f8a9417..f5a29cf0d 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IConfiguration; -import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.MetaschemaModelConstants; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.model.testing.AbstractTestSuite; -import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.model.testing.AbstractTestSuite; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import org.junit.platform.commons.JUnitException; @@ -104,7 +104,7 @@ public abstract class AbstractSchemaGeneratorTestSuite }; JSON_SCHEMA_PROVIDER = jsonProvider; // Module module = ModuleLayer.boot() - // .findModule("gov.nist.secauto.metaschema.core") + // .findModule("dev.metaschema.core") // .orElseThrow(); // // try (InputStream is diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java similarity index 86% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java rename to schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java index 95932b5ae..0ae99a6b8 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; - -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.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.validation.IContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator; +package dev.metaschema.schemagen; + +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.validation.IContentValidator; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java similarity index 80% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java rename to schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java index 7c94ceb9c..4fe307e80 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; -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.MetaschemaException; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator; -import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import org.junit.jupiter.api.Test; diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java similarity index 90% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java rename to schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java index b6af63165..d8d6930c7 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen; +package dev.metaschema.schemagen; 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.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.validation.IContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModuleLoader; -import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.validation.IContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java similarity index 98% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java rename to schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java index fe33629db..e340bdbc0 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java similarity index 99% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java rename to schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java index 5b4b79bb4..39ae49b03 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/IndentingXMLStreamWriterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java similarity index 97% rename from schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java rename to schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java index a9d7db47c..3b5265a0d 100644 --- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.impl; +package dev.metaschema.schemagen.xml.impl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; diff --git a/schemagen/src/test/resources/log4j2-test.xml b/schemagen/src/test/resources/log4j2-test.xml index 6013b1e7a..39da75927 100644 --- a/schemagen/src/test/resources/log4j2-test.xml +++ b/schemagen/src/test/resources/log4j2-test.xml @@ -10,10 +10,10 @@ - + - +