interim commit

david-waltermire · May 3, 2024 · 4d2cfe5 · 4d2cfe5
1 parent 39ffd54
commit 4d2cfe5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/...rc/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java b/...rc/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java
@@ -69,7 +69,7 @@ public final INSTANCE getInlineInstance() {
   }
 
   @Override
-  public final IFlagInstance getJsonKey() {
+  public final FLAG getJsonKey() {
     return IFeatureContainerFlag.super.getJsonKey();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java
@@ -57,7 +57,7 @@ public final INSTANCE getInlineInstance() {
   }
 
   @Override
-  public final IFlagInstance getJsonKey() {
+  public final FLAG getJsonKey() {
     return IFeatureContainerFlag.super.getJsonKey();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java
@@ -63,7 +63,7 @@ default Collection<? extends FI> getFlagInstances() {
   }
 
   @Override
-  default IFlagInstance getJsonKey() {
+  default FI getJsonKey() {
     return getFlagContainer().getJsonKeyFlagInstance();
   }
 }
diff --git a/...c/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java b/...c/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.core.model;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.Locale;
 
@@ -60,11 +61,15 @@ default QName getDefinitionQName() {
   }
 
   @Override
-  DEFINITION getDefinition();
+  default DEFINITION getDefinition() {
+    return ObjectUtils.asType(this);
+  }
 
   @Override
   @NonNull
-  INSTANCE getInlineInstance();
+  default INSTANCE getInlineInstance() {
+    return ObjectUtils.asType(this);
+  }
 
   @Override
   default String getEffectiveFormalName() {

diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java
@@ -28,8 +28,5 @@
 
 public interface IFlagDefinition extends IValuedDefinition, IFlag {
   @Override
-  default IFlagInstance getInlineInstance() {
-    // not inline by default
-    return null;
-  }
+  IFlagInstance getInlineInstance();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java
@@ -38,6 +38,11 @@ public interface IFlagInstance extends IFlag, IValuedInstance, IInstanceAbsolute
   @Override
   IFlagDefinition getDefinition();
 
+  @Override
+  default IModelDefinition getContainingDefinition() {
+    return getParentContainer();
+  }
+
   /**
    * Determines if a flag value is required to be provided.
    *

diff --git a/...rc/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFlagDefinition.java b/...rc/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFlagDefinition.java
@@ -51,6 +51,7 @@
 
 class XmlInlineFlagDefinition
     extends AbstractInlineFlagDefinition<IModelDefinition, IFlagDefinition, IFlagInstance> {
+
   @NonNull
   private final InlineFlagDefinitionType xmlFlag;
   @Nullable