Completed initial refactor of model classes. Still need to cleanup co…

…ntainer classes.
david-waltermire · May 6, 2024 · 46cf5e9 · 46cf5e9
1 parent c33018d
commit 46cf5e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java
@@ -209,17 +209,17 @@ public Exports(@NonNull List<? extends M> importedModules) {
       // as an imported one
       Map<QName, FL> exportedFlagDefinitions = flags.collect(
           CustomCollectors.toMap(
-              IFlagDefinition::getXmlQName,
+              IFlagDefinition::getDefinitionQName,
               CustomCollectors.identity(),
               AbstractModule::handleShadowedDefinitions));
       Map<QName, FI> exportedFieldDefinitions = fields.collect(
           CustomCollectors.toMap(
-              IFieldDefinition::getXmlQName,
+              IFieldDefinition::getDefinitionQName,
               CustomCollectors.identity(),
               AbstractModule::handleShadowedDefinitions));
       Map<QName, A> exportedAssemblyDefinitions = assemblies.collect(
           CustomCollectors.toMap(
-              IAssemblyDefinition::getXmlQName,
+              IAssemblyDefinition::getDefinitionQName,
               CustomCollectors.identity(),
               AbstractModule::handleShadowedDefinitions));
 

diff --git a/...bind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java b/...bind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java
@@ -278,7 +278,7 @@ public Object readItemField(Object parentItem, IBoundInstanceModelFieldComplex i
           parentItem,
           instance.getDefinition(),
           instance.getJsonProperties(),
-          instance.getJsonKey(),
+          instance.getEffectiveJsonKey(),
           getProblemHandler());
     }