Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allowed Values Command Cleanup #31

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Allowed Values Command Cleanup #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument;
import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor;
import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
import gov.nist.secauto.metaschema.core.metapath.ISequence;
import gov.nist.secauto.metaschema.core.metapath.MetapathException;
import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
import gov.nist.secauto.metaschema.core.metapath.StaticContext;
import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem;
Expand Down Expand Up @@ -261,13 +259,14 @@ private static void generateAllowedValuesList(

IModuleNodeItem moduleNodeItem = INodeItemFactory.instance().newModuleNodeItem(module);

if (metapath != null) {
MetapathExpression filter = MetapathExpression.compile(metapath, staticContext);

DynamicContext dynamicContext = new DynamicContext(staticContext);
ISequence<?> sequence = filter.evaluate(moduleNodeItem, dynamicContext);
assert sequence != null;
}
// if (metapath != null) {
// MetapathExpression filter = MetapathExpression.compile(metapath,
// staticContext);
//
// DynamicContext dynamicContext = new DynamicContext(staticContext);
// ISequence<?> sequence = filter.evaluate(moduleNodeItem, dynamicContext);
// assert sequence != null;
// }
david-waltermire marked this conversation as resolved.
Show resolved Hide resolved

DynamicContext dynamicContext = new DynamicContext(staticContext);
dynamicContext.disablePredicateEvaluation();
Expand Down Expand Up @@ -361,7 +360,7 @@ private static void writeAllowedValue(@NonNull AllowedValuesRecord record, @NonN

generator.writeStartObject(); // constraint

generator.writeStringField("type", "allowed-value");
generator.writeStringField("type", "allowed-values");

IAllowedValuesConstraint constraint = record.getAllowedValues();
if (constraint.getId() != null) {
Expand Down