This fixes usnistgov/oscal-cli#216 by ensuring that the document node…

… returns the root node when getValue is called.
GSA · May 28, 2024 · 879e58d · 879e58d
1 parent 215388a
commit 879e58d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...c/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java b/...c/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java
@@ -75,4 +75,9 @@ public URI getDocumentUri() {
   public ModelContainer getModel() {
     return model.get();
   }
+
+  @Override
+  public Object getValue() {
+    return getRootAssemblyNodeItem().getValue();
+  }
 }
diff --git a/.../src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java b/.../src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java
@@ -38,7 +38,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IDocumentNodeItem extends INodeItem, IFeatureNoDataItem {
+public interface IDocumentNodeItem extends INodeItem {
   @Override
   default NodeItemType getNodeItemType() {
     return NodeItemType.DOCUMENT;

diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java
@@ -41,7 +41,7 @@
  * All definitions in the {@link ModuleScopeEnum#INHERITED} scope. This allows
  * the exported structure of the Metaschema module to be queried.
  */
-public interface IModuleNodeItem extends IDocumentNodeItem {
+public interface IModuleNodeItem extends IDocumentNodeItem, IFeatureNoDataItem {
 
   /**
    * The Metaschema module this item is based on.