Skip to content

Commit

Permalink
Added check for another stream consumed case in stream-based sequence…
Browse files Browse the repository at this point in the history
…s caused when the stream is already consumed before a list is requested. Added support for the Metapath fn:outermost function.
  • Loading branch information
david-waltermire committed Dec 12, 2024
1 parent 97bbf07 commit 65278c1
Show file tree
Hide file tree
Showing 5 changed files with 199 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public DefaultFunctionLibrary() { // NOPMD - intentional
// https://www.w3.org/TR/xpath-functions-31/#func-one-or-more
registerFunction(FnOneOrMore.SIGNATURE);
// https://www.w3.org/TR/xpath-functions-31/#func-outermost
registerFunction(FnOutermost.SIGNATURE);
// https://www.w3.org/TR/xpath-functions-31/#func-parse-ietf-date
// https://www.w3.org/TR/xpath-functions-31/#func-path
registerFunction(FnPath.SIGNATURE_NO_ARG);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
* SPDX-FileCopyrightText: none
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.metaschema.core.metapath.function.library;

import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
import gov.nist.secauto.metaschema.core.util.ObjectUtils;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

import edu.umd.cs.findbugs.annotations.NonNull;

/**
* /** Implements
* <a href= "https://www.w3.org/TR/xpath-functions-31/#func-root">fn:root</a>
* functions.
*/
public final class FnOutermost {
@NonNull
private static final String NAME = "outermost";
@NonNull
static final IFunction SIGNATURE = IFunction.builder()
.name(NAME)
.namespace(MetapathConstants.NS_METAPATH_FUNCTIONS)
.deterministic()
.contextIndependent()
.focusDependent()
.argument(IArgument.builder()
.name("nodes")
.type(INodeItem.type())
.zeroOrMore()
.build())
.returnType(INodeItem.type())
.returnZeroOrMore()
.functionHandler(FnOutermost::execute)
.build();

@SuppressWarnings("unused")
@NonNull
private static ISequence<? extends INodeItem> execute(@NonNull IFunction function,
@NonNull List<ISequence<?>> arguments,
@NonNull DynamicContext dynamicContext,
IItem focus) {
ISequence<? extends INodeItem> nodes = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));

return ISequence.of(fnOutermost(nodes.getValue()));
}

/**
* Get every node within the provided list that is not an ancestor of another
* member of the provided list.
* <p>
* The nodes are returned in document order with duplicates eliminated.
* <p>
* Based on the XPath 3.1 <a href=
* "https://www.w3.org/TR/xpath-functions-31/#func-innermost">fn:innermost</a>
* function.
*
* @param arg
* the node items check
* @return the nodes that are not an ancestor of another member of the provided
* list
*/
@NonNull
public static Stream<? extends INodeItem> fnOutermost(@NonNull List<? extends INodeItem> arg) {
Set<? extends INodeItem> values = new HashSet<>(arg);

return ObjectUtils.notNull(arg.stream()
.distinct()
.filter(node -> !node.ancestor().anyMatch(values::contains)));
}

private FnOutermost() {
// disable construction
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public List<ITEM> getValue() {
instanceLock.lock();
try {
if (list == null) {
if (stream == null) {
throw new IllegalStateException("stream is already consumed");
}
list = stream.collect(Collectors.toUnmodifiableList());
stream = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void test(@NonNull String expectedValueMetapath, @NonNull String actualValuesMet
.evaluate(node, dynamicContext);
ISequence<? extends INodeItem> alternate
= IMetapathExpression.compile("$nodes except $nodes/ancestor::node()", dynamicContext.getStaticContext())
.evaluate(null, dynamicContext.bindVariableValue(IEnhancedQName.of("nodes"), values));
.evaluate(null, dynamicContext.subContext().bindVariableValue(IEnhancedQName.of("nodes"), values));

assertEquals(expected, actual);
assertEquals(expected, alternate);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
/*
/*
* SPDX-FileCopyrightText: none
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.metaschema.core.metapath.function.library;

import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression;
import gov.nist.secauto.metaschema.core.metapath.MetapathException;
import gov.nist.secauto.metaschema.core.metapath.function.library.impl.MockedDocumentGenerator;
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
import gov.nist.secauto.metaschema.core.metapath.type.InvalidTypeMetapathException;
import gov.nist.secauto.metaschema.core.metapath.type.TypeMetapathException;
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import java.util.stream.Stream;

import edu.umd.cs.findbugs.annotations.NonNull;

class FnOutermostTest
extends ExpressionTestBase {

private static Stream<Arguments> provideValues() { // NOPMD - false positive
return Stream.of(
// only document matches
Arguments.of(
"(.)",
"(.,/root,/root/assembly,/root/assembly/@assembly-flag,/root/field,/root/field/@field-flag)"),
// parents not present
Arguments.of(
"(/root/assembly,/root/field)",
"(/root/assembly,/root/field)"),
// parents not present
Arguments.of(
"(/root/assembly,/root/field/@field-flag)",
"(/root/assembly,/root/assembly/@assembly-flag,/root/field/@field-flag)"),
// duplicates
Arguments.of(
"(.)",
"(/root/assembly,/root/assembly/@assembly-flag,/root/field,/root/field/@field-flag," +
".,/root,/root/assembly,/root/assembly/@assembly-flag,/root/field,/root/field/@field-flag)"));
}

@ParameterizedTest
@MethodSource("provideValues")
void test(@NonNull String expectedValueMetapath, @NonNull String actualValuesMetapath) {
DynamicContext dynamicContext = newDynamicContext();
INodeItem node = MockedDocumentGenerator.generateDocumentNodeItem(getContext());

ISequence<? extends INodeItem> expected
= IMetapathExpression.compile(expectedValueMetapath, dynamicContext.getStaticContext())
.evaluate(node, dynamicContext);

ISequence<? extends INodeItem> actual
= IMetapathExpression.compile("outermost(" + actualValuesMetapath + ")", dynamicContext.getStaticContext())
.evaluate(node, dynamicContext);

// Test the expected values against the alternate implementation from the spec
ISequence<? extends INodeItem> values
= IMetapathExpression.compile(expectedValueMetapath, dynamicContext.getStaticContext())
.evaluate(node, dynamicContext);
// ensure the values are list backed
values.getValue();

ISequence<? extends INodeItem> alternate
= IMetapathExpression
.compile("$nodes[not(ancestor::node() intersect $nodes)]/.", dynamicContext.getStaticContext())
.evaluate(null, dynamicContext.subContext().bindVariableValue(IEnhancedQName.of("nodes"), values));

assertEquals(expected, actual);
assertEquals(expected, alternate);
}

@Test
void testNotANode() {
DynamicContext dynamicContext = newDynamicContext();

MetapathException ex = assertThrows(MetapathException.class, () -> {
IMetapathExpression.compile("outermost('test')", dynamicContext.getStaticContext())
.evaluateAs(IStringItem.valueOf("test"), IMetapathExpression.ResultType.ITEM, dynamicContext);
});
Throwable cause = ex.getCause() != null ? ex.getCause().getCause() : null;

assertAll(
() -> assertEquals(InvalidTypeMetapathException.class, cause == null
? null
: cause.getClass()),
() -> assertEquals(TypeMetapathException.INVALID_TYPE_ERROR, cause instanceof TypeMetapathException
? ((TypeMetapathException) cause).getCode()
: null));
}
}

0 comments on commit 65278c1

Please sign in to comment.