* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.yangtools.yang.data.codec.xml;
import static org.junit.Assert.assertEquals;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
public class Bug890Test {
private static final QName OUTGOING_LABELS_QNAME = QName.create(FOO_MODULE, "outgoing-labels");
private static final QName INDEX_QNAME = QName.create(FOO_MODULE, "index");
- private SchemaContext schemaContext;
+ private EffectiveModelContext schemaContext;
@Before
public void setUp() throws Exception {
assertTrue(result.getResult() instanceof ContainerNode);
final ContainerNode rootContainer = (ContainerNode) result.getResult();
- Optional<DataContainerChild<? extends PathArgument, ?>> myLeaf =
- rootContainer.getChild(new NodeIdentifier(OUTGOING_LABELS_QNAME));
- assertTrue(myLeaf.orElse(null) instanceof ContainerNode);
+ DataContainerChild myLeaf = rootContainer.childByArg(new NodeIdentifier(OUTGOING_LABELS_QNAME));
+ assertTrue(myLeaf instanceof ContainerNode);
- ContainerNode outgoingLabelsContainer = (ContainerNode)myLeaf.get();
- Optional<DataContainerChild<? extends PathArgument, ?>> outgoingLabelsList =
- outgoingLabelsContainer.getChild(new NodeIdentifier(OUTGOING_LABELS_QNAME));
- assertTrue(outgoingLabelsList.orElse(null) instanceof MapNode);
- MapNode outgoingLabelsMap = (MapNode) outgoingLabelsList.get();
+ ContainerNode outgoingLabelsContainer = (ContainerNode)myLeaf;
+ DataContainerChild outgoingLabelsList =
+ outgoingLabelsContainer.childByArg(new NodeIdentifier(OUTGOING_LABELS_QNAME));
+ assertTrue(outgoingLabelsList instanceof MapNode);
+ MapNode outgoingLabelsMap = (MapNode) outgoingLabelsList;
- assertEquals(2, outgoingLabelsMap.getValue().size());
- Collection<MapEntryNode> labels = outgoingLabelsMap.getValue();
- YangInstanceIdentifier.NodeIdentifierWithPredicates firstNodeId =
- new YangInstanceIdentifier.NodeIdentifierWithPredicates(OUTGOING_LABELS_QNAME, INDEX_QNAME, 0);
- YangInstanceIdentifier.NodeIdentifierWithPredicates secondNodeId =
- new YangInstanceIdentifier.NodeIdentifierWithPredicates(OUTGOING_LABELS_QNAME, INDEX_QNAME, 1);
+ assertEquals(2, outgoingLabelsMap.size());
+ Collection<MapEntryNode> labels = outgoingLabelsMap.body();
+ NodeIdentifierWithPredicates firstNodeId =
+ NodeIdentifierWithPredicates.of(OUTGOING_LABELS_QNAME, INDEX_QNAME, 0);
+ NodeIdentifierWithPredicates secondNodeId =
+ NodeIdentifierWithPredicates.of(OUTGOING_LABELS_QNAME, INDEX_QNAME, 1);
assertTrue(labels.stream().anyMatch(mapEntryNode -> mapEntryNode.getIdentifier().compareTo(firstNodeId) == 0));
assertTrue(labels.stream().anyMatch(mapEntryNode -> mapEntryNode.getIdentifier().compareTo(secondNodeId) == 0));
}