From f00aeafa962089ae4b77978e3148444634c3b286 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 20 Aug 2019 16:37:51 +0200 Subject: [PATCH] Bump yangtools to 4.0.1 This bumps yangtools to 4.0.1 as part of Magnesium MRI. Change-Id: I1ac7d3f856af310f4e8015875223d30eac3a8276 Signed-off-by: Robert Varga --- .../stream/NormalizedNodeStreamReaderWriterTest.java | 8 ++++---- node/utils/stream/SerializationUtilsTest.java | 4 ++-- node/utils/transformer/NormalizedNodePrunerTest.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java b/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java index 4b45af48e9..1e57eb4b7e 100644 --- a/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java +++ b/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java @@ -5,7 +5,6 @@ * 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.controller.cluster.datastore.node.utils.stream; import static org.junit.Assert.assertEquals; @@ -33,8 +32,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -220,10 +219,11 @@ public class NormalizedNodeStreamReaderWriterTest { StreamResult xmlOutput = new StreamResult(new StringWriter()); Transformer transformer = TransformerFactory.newInstance().newTransformer(); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); - transformer.transform(((AnyXmlNode)child.get()).getValue(), xmlOutput); + transformer.transform(((DOMSourceAnyxmlNode)child.get()).getValue(), xmlOutput); assertEquals("XML", xml, xmlOutput.getWriter().toString()); - assertEquals("http://www.w3.org/TR/html4/", ((AnyXmlNode)child.get()).getValue().getNode().getNamespaceURI()); + assertEquals("http://www.w3.org/TR/html4/", + ((DOMSourceAnyxmlNode)child.get()).getValue().getNode().getNamespaceURI()); } @Test diff --git a/node/utils/stream/SerializationUtilsTest.java b/node/utils/stream/SerializationUtilsTest.java index 610a2328f3..04da2a6956 100644 --- a/node/utils/stream/SerializationUtilsTest.java +++ b/node/utils/stream/SerializationUtilsTest.java @@ -30,9 +30,9 @@ import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; +import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; @@ -63,7 +63,7 @@ public class SerializationUtilsTest { final ByteArrayInputStream is = new ByteArrayInputStream("".getBytes(Charset.defaultCharset())); final Document parse = UntrustedXML.newDocumentBuilder().parse(is); - final AnyXmlNode anyXmlNode = Builders.anyXmlBuilder() + final DOMSourceAnyxmlNode anyXmlNode = Builders.anyXmlBuilder() .withNodeIdentifier(id("anyXmlNode")) .withValue(new DOMSource(parse)) .build(); diff --git a/node/utils/transformer/NormalizedNodePrunerTest.java b/node/utils/transformer/NormalizedNodePrunerTest.java index f15b184513..50ade7875f 100644 --- a/node/utils/transformer/NormalizedNodePrunerTest.java +++ b/node/utils/transformer/NormalizedNodePrunerTest.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; -import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; +import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -257,7 +257,7 @@ public class NormalizedNodePrunerTest { @Test public void testAnyXMLNodeNotPrunedWhenHasParent() throws IOException { NormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH); - AnyXmlNode child = Builders.anyXmlBuilder().withNodeIdentifier( + DOMSourceAnyxmlNode child = Builders.anyXmlBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.ANY_XML_QNAME)).withValue(mock(DOMSource.class)).build(); NormalizedNode input = Builders.containerBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.TEST_QNAME)).withChild(child).build(); -- 2.36.6