Skip to content

Commit c96c1ab

Browse files
david-waltermiredavid-waltermire
authored
refactor!: rename all packages to dev.metaschema namespace (#232)
* build: add .worktrees/ to .gitignore for isolated development * refactor: update imports for metaschema-java package rename Update all imports from gov.nist.secauto.metaschema.* to dev.metaschema.* to align with metaschema-java PR #618. Changes: - Update metaschema-java dependency to 3.0.0-SNAPSHOT - Update all Java imports to use dev.metaschema namespace - Rename SPI service file for IFunctionLibrary BREAKING CHANGE: Requires metaschema-java 3.0.0-SNAPSHOT or later * refactor!: rename packages from gov.nist.secauto.oscal to dev.metaschema.oscal Rename all Java packages to align with the dev.metaschema namespace: - gov.nist.secauto.oscal.lib -> dev.metaschema.oscal.lib - gov.nist.secauto.oscal.java -> dev.metaschema.oscal.lib (consolidated) BREAKING CHANGE: All Java packages have been renamed. Downstream projects must update their imports from gov.nist.secauto.oscal.* to dev.metaschema.oscal.* * chore: remove unused dependencies and update versions - Remove xmlresolver and xmlbeans dependencies (not used directly) - Update log4j2 from 2.25.2 to 2.25.3 (dependency convergence) - Update Saxon from 12.9 to 12.5 (align with metaschema-java) * fix: resolve SpotBugs warnings for redundant null checks - Remove redundant null check in ResolveReference (getHref is @nonnull) - Use Boolean.TRUE.equals() in ProfileResolver to avoid double evaluation - Remove redundant null checks in AddVisitor for lazy-initialized collections - Change null checks to isEmpty checks in IControlFilter - Simplify generateMetadata in Import (getMetadata is @nonnull)
1 parent f444c82 commit c96c1ab

File tree

105 files changed

+817
-890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+817
-890
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ velocity.log*
2222

2323
# Claude
2424
CLAUDE.local.md
25+
26+
# Git worktrees
27+
.worktrees/

‎pom.xml‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<groupId>dev.metaschema.oscal</groupId>
1111
<artifactId>liboscal-java</artifactId>
12-
<version>6.1.0-SNAPSHOT</version>
12+
<version>7.0.0-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414

1515
<name>OSCAL Java Library</name>
@@ -93,15 +93,13 @@
9393
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
9494
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9595

96-
<dependency.metaschema-framework.version>3.0.0.M1</dependency.metaschema-framework.version>
96+
<dependency.metaschema-framework.version>3.0.0-SNAPSHOT</dependency.metaschema-framework.version>
9797

9898
<dependency.commons-lang3.version>3.20.0</dependency.commons-lang3.version>
9999
<dependency.jmock-junit5.version>2.13.1</dependency.jmock-junit5.version>
100100
<dependency.lazy4j.version>2.0.3</dependency.lazy4j.version>
101-
<dependency.log4j2.version>2.25.2</dependency.log4j2.version>
102-
<dependency.saxon.version>12.9</dependency.saxon.version>
103-
<dependency.xmlbeans.version>5.3.0</dependency.xmlbeans.version>
104-
<dependency.xmlresolver.version>6.0.19</dependency.xmlresolver.version>
101+
<dependency.log4j2.version>2.25.3</dependency.log4j2.version>
102+
<dependency.saxon.version>12.5</dependency.saxon.version>
105103
<dependency.xmlunit.version>2.11.0</dependency.xmlunit.version>
106104

107105
<plugin.cyclonedx.version>2.9.1</plugin.cyclonedx.version>
@@ -170,36 +168,6 @@
170168
<scope>import</scope>
171169
<type>pom</type>
172170
</dependency>
173-
<dependency>
174-
<groupId>org.xmlresolver</groupId>
175-
<artifactId>xmlresolver</artifactId>
176-
<version>${dependency.xmlresolver.version}</version>
177-
<classifier>data</classifier>
178-
<exclusions>
179-
<exclusion>
180-
<!-- to avoid duplicate import of XML APIs -->
181-
<groupId>xml-apis</groupId>
182-
<artifactId>xml-apis</artifactId>
183-
</exclusion>
184-
</exclusions>
185-
</dependency>
186-
<dependency>
187-
<groupId>org.xmlresolver</groupId>
188-
<artifactId>xmlresolver</artifactId>
189-
<version>${dependency.xmlresolver.version}</version>
190-
<exclusions>
191-
<exclusion>
192-
<!-- to avoid duplicate import of XML APIs -->
193-
<groupId>xml-apis</groupId>
194-
<artifactId>xml-apis</artifactId>
195-
</exclusion>
196-
</exclusions>
197-
</dependency>
198-
<dependency>
199-
<groupId>org.apache.xmlbeans</groupId>
200-
<artifactId>xmlbeans</artifactId>
201-
<version>${dependency.xmlbeans.version}</version>
202-
</dependency>
203171

204172
<dependency>
205173
<groupId>org.junit</groupId>

src/main/java-templates/gov/nist/secauto/oscal/lib/LibOscalVersion.java renamed to src/main/java-templates/dev/metaschema/oscal/lib/LibOscalVersion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib;
6+
package dev.metaschema.oscal.lib;
77

8-
import gov.nist.secauto.metaschema.core.util.IVersionInfo;
8+
import dev.metaschema.core.util.IVersionInfo;
99

1010
/**
1111
* Provides version information for this library.

src/main/java-templates/gov/nist/secauto/oscal/lib/OscalVersion.java renamed to src/main/java-templates/dev/metaschema/oscal/lib/OscalVersion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib;
6+
package dev.metaschema.oscal.lib;
77

8-
import gov.nist.secauto.metaschema.core.util.IVersionInfo;
8+
import dev.metaschema.core.util.IVersionInfo;
99

1010
/**
1111
* Provides version information for the underlying OSCAL implementation used by this library.

src/main/java/gov/nist/secauto/oscal/lib/OscalBindingContext.java renamed to src/main/java/dev/metaschema/oscal/lib/OscalBindingContext.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib;
7-
8-
import gov.nist.secauto.metaschema.core.metapath.StaticContext;
9-
import gov.nist.secauto.metaschema.core.model.MetaschemaException;
10-
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
11-
import gov.nist.secauto.metaschema.databind.DefaultBindingContext;
12-
import gov.nist.secauto.metaschema.databind.IBindingContext;
13-
import gov.nist.secauto.metaschema.databind.SimpleModuleLoaderStrategy;
14-
import gov.nist.secauto.oscal.lib.model.AssessmentPlan;
15-
import gov.nist.secauto.oscal.lib.model.AssessmentResults;
16-
import gov.nist.secauto.oscal.lib.model.Catalog;
17-
import gov.nist.secauto.oscal.lib.model.ComponentDefinition;
18-
import gov.nist.secauto.oscal.lib.model.OscalCompleteModule;
19-
import gov.nist.secauto.oscal.lib.model.PlanOfActionAndMilestones;
20-
import gov.nist.secauto.oscal.lib.model.Profile;
21-
import gov.nist.secauto.oscal.lib.model.SystemSecurityPlan;
6+
package dev.metaschema.oscal.lib;
7+
8+
import dev.metaschema.core.metapath.StaticContext;
9+
import dev.metaschema.core.model.MetaschemaException;
10+
import dev.metaschema.core.util.ObjectUtils;
11+
import dev.metaschema.databind.DefaultBindingContext;
12+
import dev.metaschema.databind.IBindingContext;
13+
import dev.metaschema.databind.SimpleModuleLoaderStrategy;
14+
import dev.metaschema.oscal.lib.model.AssessmentPlan;
15+
import dev.metaschema.oscal.lib.model.AssessmentResults;
16+
import dev.metaschema.oscal.lib.model.Catalog;
17+
import dev.metaschema.oscal.lib.model.ComponentDefinition;
18+
import dev.metaschema.oscal.lib.model.OscalCompleteModule;
19+
import dev.metaschema.oscal.lib.model.PlanOfActionAndMilestones;
20+
import dev.metaschema.oscal.lib.model.Profile;
21+
import dev.metaschema.oscal.lib.model.SystemSecurityPlan;
2222

2323
import java.io.File;
2424
import java.io.IOException;

src/main/java/gov/nist/secauto/oscal/lib/OscalModelConstants.java renamed to src/main/java/dev/metaschema/oscal/lib/OscalModelConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib;
6+
package dev.metaschema.oscal.lib;
77

8-
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
8+
import dev.metaschema.core.qname.IEnhancedQName;
99

1010
import edu.umd.cs.findbugs.annotations.NonNull;
1111

src/main/java/gov/nist/secauto/oscal/lib/OscalUtils.java renamed to src/main/java/dev/metaschema/oscal/lib/OscalUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib;
6+
package dev.metaschema.oscal.lib;
77

8-
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
9-
import gov.nist.secauto.oscal.lib.model.BackMatter.Resource;
10-
import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink;
8+
import dev.metaschema.core.util.ObjectUtils;
9+
import dev.metaschema.oscal.lib.model.BackMatter.Resource;
10+
import dev.metaschema.oscal.lib.model.BackMatter.Resource.Rlink;
1111

1212
import java.net.URI;
1313
import java.util.List;

src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/HasOscalNamespace.java renamed to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/HasOscalNamespace.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib.metapath.function.library;
7-
8-
import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException;
9-
import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
10-
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
11-
import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
12-
import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
13-
import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
14-
import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException;
15-
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
16-
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
17-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
18-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
19-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
20-
import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
21-
import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
22-
import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
23-
import gov.nist.secauto.metaschema.core.model.IFlagInstance;
24-
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
25-
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
26-
import gov.nist.secauto.oscal.lib.OscalModelConstants;
27-
import gov.nist.secauto.oscal.lib.model.metadata.IProperty;
6+
package dev.metaschema.oscal.lib.metapath.function.library;
7+
8+
import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException;
9+
import dev.metaschema.core.metapath.DynamicContext;
10+
import dev.metaschema.core.metapath.MetapathConstants;
11+
import dev.metaschema.core.metapath.function.FunctionUtils;
12+
import dev.metaschema.core.metapath.function.IArgument;
13+
import dev.metaschema.core.metapath.function.IFunction;
14+
import dev.metaschema.core.metapath.function.InvalidTypeFunctionException;
15+
import dev.metaschema.core.metapath.item.IItem;
16+
import dev.metaschema.core.metapath.item.ISequence;
17+
import dev.metaschema.core.metapath.item.atomic.IAnyUriItem;
18+
import dev.metaschema.core.metapath.item.atomic.IBooleanItem;
19+
import dev.metaschema.core.metapath.item.atomic.IStringItem;
20+
import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem;
21+
import dev.metaschema.core.metapath.item.node.IFlagNodeItem;
22+
import dev.metaschema.core.model.IAssemblyDefinition;
23+
import dev.metaschema.core.model.IFlagInstance;
24+
import dev.metaschema.core.qname.IEnhancedQName;
25+
import dev.metaschema.core.util.ObjectUtils;
26+
import dev.metaschema.oscal.lib.OscalModelConstants;
27+
import dev.metaschema.oscal.lib.model.metadata.IProperty;
2828

2929
import java.net.URI;
3030
import java.util.List;

src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/OscalFunctionLibrary.java renamed to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/OscalFunctionLibrary.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib.metapath.function.library;
6+
package dev.metaschema.oscal.lib.metapath.function.library;
77

8-
import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary;
8+
import dev.metaschema.core.metapath.function.FunctionLibrary;
99

1010
public class OscalFunctionLibrary
1111
extends FunctionLibrary {

src/main/java/gov/nist/secauto/oscal/lib/metapath/function/library/ResolveProfile.java renamed to src/main/java/dev/metaschema/oscal/lib/metapath/function/library/ResolveProfile.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.oscal.lib.metapath.function.library;
7-
8-
import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
9-
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
10-
import gov.nist.secauto.metaschema.core.metapath.function.DocumentFunctionException;
11-
import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
12-
import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
13-
import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
14-
import gov.nist.secauto.metaschema.core.metapath.function.library.FnDoc;
15-
import gov.nist.secauto.metaschema.core.metapath.function.library.FnResolveUri;
16-
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
17-
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
18-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
19-
import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
20-
import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
21-
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
22-
import gov.nist.secauto.oscal.lib.OscalModelConstants;
23-
import gov.nist.secauto.oscal.lib.model.Catalog;
24-
import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException;
25-
import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver;
6+
package dev.metaschema.oscal.lib.metapath.function.library;
7+
8+
import dev.metaschema.core.metapath.DynamicContext;
9+
import dev.metaschema.core.metapath.MetapathConstants;
10+
import dev.metaschema.core.metapath.function.DocumentFunctionException;
11+
import dev.metaschema.core.metapath.function.FunctionUtils;
12+
import dev.metaschema.core.metapath.function.IArgument;
13+
import dev.metaschema.core.metapath.function.IFunction;
14+
import dev.metaschema.core.metapath.function.library.FnDoc;
15+
import dev.metaschema.core.metapath.function.library.FnResolveUri;
16+
import dev.metaschema.core.metapath.item.IItem;
17+
import dev.metaschema.core.metapath.item.ISequence;
18+
import dev.metaschema.core.metapath.item.atomic.IAnyUriItem;
19+
import dev.metaschema.core.metapath.item.node.IDocumentNodeItem;
20+
import dev.metaschema.core.metapath.item.node.INodeItem;
21+
import dev.metaschema.core.util.ObjectUtils;
22+
import dev.metaschema.oscal.lib.OscalModelConstants;
23+
import dev.metaschema.oscal.lib.model.Catalog;
24+
import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException;
25+
import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver;
2626

2727
import java.io.IOException;
2828
import java.net.URI;

0 commit comments

Comments
 (0)