Refactored core model classes and support for collections of model in… #256

…stances.

…interfaces. Removed the need to instances of IDataTypeHandler. Now IClassDataTypeHandler functionality is provided by IFeatureComplexItemValueHandler and JavaTypeAdapterDataTypeHandler is provided by IFeatureScalarItemValueHandler. Refactored bound class hierarchy to be more consistent with needed methods. - Moved Java field handling to IFeatureJavaField from IBoundNamedModelInstance - Moved JSON key and item handling to IBoundModelInstance. - Reworked XML and JSON reading and writing. - Added IBoundChoiceGroupInstance interface for choice groups.

Cleaned up IModelPropertyInfo and implementations, relocating supporting classes as child classes. Implemented a IModelInstance item parsing as IModelPropertyInfo.IReadHandler, allowing all item parsing to be implemented in the format-specific parsing classes, i.e. MetaschemaJsonReader, MetaschemaXmlReader.

… parsed value. Eliminated the need for IPropertyCollector instances.

… of terminology. Prior the terms "property" and "instance" were used interchangeably, which could cause some confusion.

…llectionInfo.IWriteHandler implementation, allowing all item writing to be implemented in the format-specific classes, i.e. MetaschemaJsonWriter, MetaschemaXmlWriter.

Aligned annotations with class generation, adding support for many missing annotation entries.

…for unparsed model instances. Refactored JSON key handling to determine the JSON key on a per item basis. This is needed for ChoiceGroups. Fixed IBindingMatcher to use the correct class type.

Fixed some PMD errors.

…emaJsonReader and MetaschemaJsonWriter using dispatch methods. This allows are IO code to be implemented withing the JSON format-specific implementation.

…maXmlReader and MetaschemaXmlWriter using dispatch methods. This allows are IO code to be implemented withing the XML format-specific implementation.

…model instances, with minimal implementation. Cleaned up getDefaultValue and getEffectiveDefaultValue methods. Implemented choice group writing for XML, JSON, and YAML. Initial commit of the Metaschema module bindings.

… complex form, since a grouped item must have a bound class to determine its item type. Cleaned up JSON value key naming code. Adjusted the name used during code generation to use the value key name if available. This provides a more sensible name for Java property get and set methods created during code generation. Added support for deprecated on allowed value enumerations.

Fixed the compile error in SimpleFieldInstance by creating the ISimpleScalarItemValueJavaField interface to combine the interfaces used and point the getValue and setValue methods to the correct implementation.

…the order in which they are declared in the Metaschema module. Fixed compile errors.

Cleaned up bound module loading in DefaultBindingContext. Stubbed out grouped instance implementations. Started refactor of choice group instances. Still need to work on Metapath items and other unimplemented methods. Added testing of assemblies with various types of fields and flags. Refactored DefaultJsonDeserializer to read a root element without the need to produce a Metapath item first. Implemented new unit tests to test the model bindings. Adjusted the class generation for grouped instances to allow for extended classes where definitions are used by reference. Implemented subclass generation for choice group instances. Updated generated Metaschema module classes.

…elated "bound" interfaces and classes.

… not work.

Added support for parsing XML fields as a root element.

…ill. Fixed miscellaneous compile errors in other modules.

Fixed compile errors for other modules to align with recent changes.

Fixed some compile issues. Fixed remaining unit tests.

… the parser use.

…h change integration. Started work on Metaschema module wrappers for bound objects.

… module binding instead of the XML parser. Metaschema modules in XML, JSON, and YAML can now be fully read!

…with OSCAL Metaschema modules.

…tion where possible. Refactored group-as namespace handling to allow for no namespace situations. Implemented getEffectiveGroupAsNamespace to handle the default case of using the module namespace where no group-as support is provided. Relocated the IModulePostProcessor interface to the new IModuleLoader interface. Refactored flag and field name handling for a cleaner implementation. This new approach uses "name" as the binding annotation value for flags, instead of "useName". Completed binding support. All current JUnit tests run without error. Added support for a model(node) Metapath function that gets a nodeset based on the underlying Metaschema module model for the node.

Fixed remaining JUnit and schema generation bugs.

…d API.

Refactored JSON schema generator. Many improvements to the indexing approach used to determine which definitions become global definitions in the JSON schema. Fixed missing properties in choice group items. Improved JSON documentation to include titles and descriptions on properties. JSON and XML schema generation for choice groups is working.

…end up as null. Fixed a bug causing empty annotation documentation in XML for enumerated values with no description.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactored core model classes and support for collections of model in… #256

Refactored core model classes and support for collections of model in… #256

Commits on Jan 24, 2024